Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc: enterprise sync of ref chart #6283

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

misc: enterprise sync of ref chart #6283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bf458a
enterprise sync of ref chart
kamal-devtron Jan 6, 2025
e729998
changes in istio
kamal-devtron Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- else }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
{{- end }}
replicas: {{ $.Values.replicaCount }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand All @@ -71,20 +71,19 @@ spec:
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
release: {{ $.Release.Name }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- end }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
{{ toYaml .Values.podExtraSpecs | indent 6 }}
Expand Down Expand Up @@ -240,6 +239,7 @@ spec:
- name: {{ .name}}
containerPort: {{ .port }}
protocol: {{ .protocol | default "TCP" }}
protocol: {{ .protocol | default "TCP" }}
{{- end}}
{{- if and $.Values.command.enabled $.Values.command.workingDir }}
workingDir: {{ $.Values.command.workingDir }}
Expand Down Expand Up @@ -492,7 +492,7 @@ spec:
{{- end }}
{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if $.Values.appMetrics }}
- name: envoy
image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}}
Expand Down Expand Up @@ -624,6 +624,8 @@ spec:
{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) (eq (.Values.appMetrics) false) }} []{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) (eq (.Values.appMetrics) false) }} [] {{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) (eq (.Values.appMetrics) false) }} []{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) (eq (.Values.appMetrics) false) }} [] {{- end }}

revisionHistoryLimit: 3
## pauseForSecondsBeforeSwitchActive: {{ $.Values.pauseForSecondsBeforeSwitchActive }}
Expand Down Expand Up @@ -666,9 +668,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- end }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
replicas: {{ $.Values.secondaryWorkload.replicaCount | default 1 }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand Down Expand Up @@ -850,6 +853,7 @@ spec:
- name: {{ .name}}
containerPort: {{ .port }}
protocol: {{ .protocol | default "TCP" }}
protocol: {{ .protocol | default "TCP" }}
{{- end}}
{{- if and $.Values.command.enabled $.Values.command.workingDir }}
workingDir: {{ $.Values.command.workingDir }}
Expand Down Expand Up @@ -1102,7 +1106,7 @@ spec:
{{- end }}
{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) }} []{{- end }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if and (eq (len .Values.volumeMounts) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) }} [] {{- end }}
{{- if $.Values.appMetrics }}
- name: envoy
image: {{ $.Values.envoyproxy.image | default "quay.io/devtron/envoy:v1.16.0"}}
Expand Down Expand Up @@ -1233,7 +1237,7 @@ spec:
{{- end }}
{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (or (eq (.Values.ConfigSecrets.enabled) true) (eq (.Values.ConfigMaps.enabled) true)) (eq ($hasCMVolumeExists) false) (eq ($hasSecretVolumeExists) false) (eq (.Values.appMetrics) false) }} []{{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) (eq (.Values.appMetrics) false)}} [] {{- end }}
{{- if and (eq (len .Values.volumes) 0) (eq ($hasPVCExists) false) (eq (.Values.ConfigSecrets.enabled) false) (eq (.Values.ConfigMaps.enabled) false) (eq (.Values.appMetrics) false) }} [] {{- end }}

revisionHistoryLimit: 3
## pauseForSecondsBeforeSwitchActive: {{ $.Values.pauseForSecondsBeforeSwitchActive }}
Expand All @@ -1248,4 +1252,5 @@ spec:
{{- if eq .Values.deploymentType "RECREATE" }}
type: "Recreate"
{{- end }}
{{- end }}
{{- end }}

3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ metadata:
{{- if .Values.autoscaling.labels }}
{{ toYaml .Values.autoscaling.labels | indent 4 }}
{{- end }}
{{- if $.Values.appLabels }}
{{ toYaml $.Values.appLabels | indent 4 }}
{{- end }}
spec:
scaleTargetRef:
apiVersion: apps/v1
Expand Down
12 changes: 12 additions & 0 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ spec:
name: http
protocol: HTTP
hosts:
{{- if .Values.istio.gateway.host }}
- {{ .Values.istio.gateway.host | quote -}}
{{- else if .Values.istio.gateway.hosts }}
{{- range .Values.istio.gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{ with .Values.istio.gateway }}
{{- if .tls.enabled }}
tls:
Expand All @@ -38,7 +44,13 @@ spec:
name: https
protocol: HTTPS
hosts:
{{- if .host }}
- {{ .host | quote }}
{{- else if .hosts }}
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
tls:
mode: SIMPLE
credentialName: {{ .tls.secretName }}
Expand Down
6 changes: 6 additions & 0 deletions ...devtron-reference-helm-charts/deployment-chart_4-20-0/templates/istio-virtualservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ spec:
{{- if or .gateway.enabled .virtualService.hosts }}
hosts:
{{- if .gateway.enabled }}
{{- if .gateway.host }}
- {{ .gateway.host | quote }}
{{- else if .gateway.hosts }}
{{- range .gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- range .virtualService.hosts }}
- {{ . | quote }}
Expand Down
4 changes: 3 additions & 1 deletion ...pts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/keda-autoscaling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ metadata:
release: {{ $.Release.Name }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}

{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }}
{{- end }}
Expand Down
15 changes: 9 additions & 6 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,20 @@ service:
# test3: test4

istio:
enable: false
enable: true
gateway:
enabled: false
enabled: true
labels: {}
annotations: {}
host: example.com
# host: example.com
hosts:
- kamal
- "example4.com"
tls:
enabled: false
enabled: true
secretName: example-tls-secret
virtualService:
enabled: false
enabled: true
labels: {}
annotations: {}
gateways: []
Expand Down Expand Up @@ -766,7 +769,7 @@ affinity:
topologyKey: topology.kubernetes.io/zone

secondaryWorkload:
enabled: true
enabled: false
postfix: "od"
replicaCount: 1
affinity: {}
Expand Down
4 changes: 3 additions & 1 deletion scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,9 @@ ConfigSecrets:
enabled: false
secrets: []
enabled: false
secrets: []
secrets: []
enabled: false
secrets: []
# data:
# key1: key1value-1
# key2: key2value-1
Expand Down
21 changes: 10 additions & 11 deletions scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- else }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
{{- end }}
replicas: {{ $.Values.replicaCount }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand All @@ -70,20 +70,19 @@ spec:
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
release: {{ $.Release.Name }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- end }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
{{ toYaml .Values.podExtraSpecs | indent 6 }}
Expand Down Expand Up @@ -622,4 +621,4 @@ spec:
maxUnavailable: {{ $.Values.deployment.strategy.canary.maxUnavailable }}
steps:
{{ toYaml .Values.deployment.strategy.canary.steps | indent 8 }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ metadata:
{{- if .Values.autoscaling.labels }}
{{ toYaml .Values.autoscaling.labels | indent 4 }}
{{- end }}
{{- if $.Values.appLabels }}
{{ toYaml $.Values.appLabels | indent 4 }}
{{- end }}
spec:
scaleTargetRef:
apiVersion: argoproj.io/v1alpha1
Expand Down
12 changes: 12 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/istio-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ spec:
name: http
protocol: HTTP
hosts:
{{- if .Values.istio.gateway.host }}
- {{ .Values.istio.gateway.host | quote -}}
{{- else if .Values.istio.gateway.hosts }}
{{- range .Values.istio.gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{ with .Values.istio.gateway }}
{{- if .tls.enabled }}
tls:
Expand All @@ -38,7 +44,13 @@ spec:
name: https
protocol: HTTPS
hosts:
{{- if .host }}
- {{ .host | quote }}
{{- else if .hosts }}
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
tls:
mode: SIMPLE
credentialName: {{ .tls.secretName }}
Expand Down
6 changes: 6 additions & 0 deletions .../devtron-reference-helm-charts/reference-chart_4-20-0/templates/istio-virtualservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ spec:
{{- if or .gateway.enabled .virtualService.hosts }}
hosts:
{{- if .gateway.enabled }}
{{- if .gateway.host }}
- {{ .gateway.host | quote }}
{{- else if .gateway.hosts }}
{{- range .gateway.hosts }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- range .virtualService.hosts }}
- {{ . | quote }}
Expand Down
4 changes: 3 additions & 1 deletion scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/keda-autoscaling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ metadata:
release: {{ $.Release.Name }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}

{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{ toYaml $.Values.kedaAutoscaling.triggerAuthentication.spec | indent 2 }}
{{- end }}
Expand Down
Loading
Loading