Skip to content

fix: changes in labels of ref chart 4.20 #6178

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

Merged
merged 7 commits into from
Dec 20, 2024
Merged

fix: changes in labels of ref chart 4.20 #6178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c48b22e
changes in labels of ref chart 4.20
kamal-devtron Dec 13, 2024
eb7f938
changes in labels of ref chart 4.20
kamal-devtron Dec 13, 2024
0efdcfa
cherry pick fixes
kamal-devtron Nov 13, 2024
e1d5367
changes in charts
kamal-devtron Nov 11, 2024
7522d0b
Merge branch 'main' into chart-label-fix
pawan-mehta-dt Dec 20, 2024
e4d7662
Merge branch 'main' into chart-label-fix
kamal-devtron Dec 20, 2024
65a8733
Merge branch 'main' into chart-label-fix
prakarsh-dt Dec 20, 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
30 changes: 16 additions & 14 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,9 +56,10 @@ spec:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- end }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
replicas: {{ $.Values.replicaCount }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand All @@ -70,19 +71,20 @@ spec:
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
release: {{ $.Release.Name }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- end }}
{{- if .Values.appLabels }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- end }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
{{ toYaml .Values.podExtraSpecs | indent 6 }}
Expand Down Expand Up @@ -237,7 +239,7 @@ spec:
{{- range $.Values.ContainerPort }}
- name: {{ .name}}
containerPort: {{ .port }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
{{- end}}
{{- if and $.Values.command.enabled $.Values.command.workingDir }}
workingDir: {{ $.Values.command.workingDir }}
Expand Down Expand Up @@ -620,8 +622,8 @@ spec:
{{- end }}
{{- 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.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 @@ -847,7 +849,7 @@ spec:
{{- range $.Values.ContainerPort }}
- name: {{ .name}}
containerPort: {{ .port }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
{{- end}}
{{- if and $.Values.command.enabled $.Values.command.workingDir }}
workingDir: {{ $.Values.command.workingDir }}
Expand Down Expand Up @@ -1230,8 +1232,8 @@ spec:
{{- end }}
{{- 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.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
3 changes: 3 additions & 0 deletions .../devtron-reference-helm-charts/deployment-chart_4-20-0/templates/poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ metadata:
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" $ }}
release: {{ $.Release.Name }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{- if .Values.podDisruptionBudget.minAvailable }}
minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
Expand Down
2 changes: 1 addition & 1 deletion scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
{{- else }}
targetPort: {{ .name }}
{{- end }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
{{- if (and (eq $.Values.service.type "NodePort") .nodePort ) }}
nodePort: {{ .nodePort }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ metadata:
{{- if .Values.servicemonitor.additionalLabels }}
{{ toYaml .Values.servicemonitor.additionalLabels | indent 4 }}
{{- end }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
endpoints:
{{- range .Values.ContainerPort }}
Expand Down
3 changes: 3 additions & 0 deletions ...tron-reference-helm-charts/deployment-chart_4-20-0/templates/vertical-pod-autoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" . }}
release: {{ .Values.prometheus.release }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{- if .Values.verticalPodScaling.resourcePolicy }}
resourcePolicy:
Expand Down
28 changes: 5 additions & 23 deletions 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 @@ -556,18 +556,10 @@ ConfigMaps:


ConfigSecrets:
enabled: true
secrets:
- name: config-secret-1
type: volume
filePermission: "420"
externalType: ESO_GoogleSecretsManager
mountPath: /etc/config/2
esoSecretData:
esoData:
- key": kushagra-test
property: test1
secretKey: SECRET_KUSHAGRA
enabled: false
secrets: []
enabled: false
secrets: []
# data:
# key1: key1value-1
# key2: key2value-1
Expand All @@ -593,19 +585,9 @@ initContainers: []
# # This will assign your application's docker image to init container.
# reuseContainerImage: true

containers:
containers: []
## Additional init containers to run before the Scheduler pods.
## for example, be used to run a sidecar that chown Logs storage .
- name: volume-mount-hack
image: busybox
command: ["sh", "-c", "chown -R 1000:1000 logs"]
volumeMounts:
- mountPath: /usr/local/airflow/logs
name: logs-data
envFrom:
- configMapRef:
name: kamal


rawYaml: []
# - apiVersion: v1
Expand Down
33 changes: 23 additions & 10 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 @@ -53,8 +53,12 @@ metadata:
spec:
selector:
matchLabels:
{{- if .Values.customMatchLabels }}
{{ toYaml .Values.customMatchLabels | indent 6 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- end }}
replicas: {{ $.Values.replicaCount }}
minReadySeconds: {{ $.Values.MinReadySeconds }}
template:
Expand All @@ -66,19 +70,20 @@ spec:
{{- end }}
{{- end }}
labels:
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
release: {{ $.Release.Name }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- end }}
{{- if .Values.appLabels }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- end }}
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
release: {{ $.Release.Name }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- end }}
spec:
{{- if $.Values.podExtraSpecs }}
{{ toYaml .Values.podExtraSpecs | indent 6 }}
Expand Down Expand Up @@ -218,7 +223,7 @@ spec:
{{- range $.Values.ContainerPort }}
- name: {{ .name}}
containerPort: {{ .port }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
{{- end}}
{{- if and $.Values.command.enabled $.Values.command.workingDir }}
workingDir: {{ $.Values.command.workingDir }}
Expand Down Expand Up @@ -490,13 +495,13 @@ spec:
args: ["-c", "/etc/envoy-config/envoy-config.json", "-l", "info", "--log-format", "[METADATA][%Y-%m-%d %T.%e][%t][%l][%n] %v"]
volumeMounts:
- name: {{ $.Values.envoyproxy.configMapName | default "envoy-config-volume" }}
mountPath: /etc/envoy-config/envoy-config-volume
mountPath: /etc/envoy-config/
{{- if $.Values.envoyproxy.readinessProbe}}
readinessProbe:
{{ toYaml $.Values.envoyproxy.readinessProbe | indent 12}}
{{- end }}
{{- if $.Values.envoyproxy.livenessProbe}}
readinessProbe:
livenessProbe:
{{ toYaml $.Values.envoyproxy.livenessProbe | indent 12}}
{{- end }}
{{- end}}
Expand All @@ -506,6 +511,14 @@ spec:
- name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }}
image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}"
imagePullPolicy: {{ $.Values.image.pullPolicy }}
{{- if .env }}
env:
{{ toYaml .env | indent 12 }}
{{- end }}
{{- if .envFrom }}
envFrom:
{{ toYaml .env | indent 12 }}
{{- end }}
{{- if .securityContext }}
securityContext:
{{ toYaml .securityContext | indent 12 }}
Expand Down
2 changes: 1 addition & 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 @@ -13,7 +13,7 @@ metadata:
release: {{ $.Release.Name }}
appId: {{ $.Values.app | quote }}
envId: {{ $.Values.env | quote }}
release: {{ .Release.Name }}
release: {{ .Release.Name }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions ...s/devtron-reference-helm-charts/reference-chart_4-20-0/templates/poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ metadata:
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" $ }}
release: {{ $.Release.Name }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{- if .Values.podDisruptionBudget.minAvailable }}
minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
Expand Down
2 changes: 1 addition & 1 deletion scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
{{- if (and (eq $.Values.service.type "NodePort") .nodePort )}}
nodePort: {{ .nodePort }}
{{- end }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
name: {{ .name }}
{{- end }}
{{- if $.Values.appMetrics }}
Expand Down
3 changes: 3 additions & 0 deletions scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ metadata:
{{- if .Values.servicemonitor.additionalLabels }}
{{ toYaml .Values.servicemonitor.additionalLabels | indent 4 }}
{{- end }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
endpoints:
{{- range .Values.ContainerPort }}
Expand Down
3 changes: 3 additions & 0 deletions ...vtron-reference-helm-charts/reference-chart_4-20-0/templates/vertical-pod-autoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
envId: {{ $.Values.env | quote }}
chart: {{ template ".Chart.Name .chart" . }}
release: {{ .Values.prometheus.release }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 4 }}
{{- end }}
spec:
{{- if .Values.verticalPodScaling.resourcePolicy }}
resourcePolicy:
Expand Down
2 changes: 1 addition & 1 deletion scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
{{- if (and (eq $.Values.service.type "NodePort") .nodePort )}}
nodePort: {{ .nodePort }}
{{- end }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
name: {{ .name }}
{{- end }}
{{- if $.Values.appMetrics }}
Expand Down
5 changes: 4 additions & 1 deletion scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ spec:
labels:
{{- if .Values.customPodLabels }}
{{ toYaml .Values.customPodLabels | indent 8 }}
{{- if .Values.appLabels }}
{{ toYaml .Values.appLabels | indent 8 }}
{{- end }}
{{- else }}
app: {{ template ".Chart.Name .name" $ }}
appId: {{ $.Values.app | quote }}
Expand Down Expand Up @@ -307,7 +310,7 @@ spec:
{{- range $.Values.ContainerPort }}
- name: {{ .name}}
containerPort: {{ .port }}
protocol: {{ .protocol }}
protocol: {{ .protocol | default "TCP" }}
{{- end}}
{{- if and $.Values.command.enabled $.Values.command.workingDir }}
workingDir: {{ $.Values.command.workingDir }}
Expand Down
4 changes: 2 additions & 2 deletions scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ EnvVariables:
value: qa

LivenessProbe:
Path: /
Path: ""
port: 8080
initialDelaySeconds: 20
periodSeconds: 10
Expand All @@ -168,7 +168,7 @@ LivenessProbe:
# value: abc

ReadinessProbe:
Path: /
Path: ""
port: 8080
initialDelaySeconds: 20
periodSeconds: 10
Expand Down
Loading