DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to work with existing labels

Browse source 
Signed-off-by: mpeters0n <2matthew.peterson@gmail.com>
This commit is contained in:
mpeters0n 2024-03-20 09:52:38 -07:00
parent d1dd1ec5d8
commit 3fc90b9357
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-rollouts/templates/controller/deployment.yaml
View file

@ -9,11 +9,9 @@ metadata:
{{- end }} {{- end }}
name: {{ include "argo-rollouts.fullname" . }} name: {{ include "argo-rollouts.fullname" . }}
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
{{- with (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.controller.deploymentLabels) }}
labels: labels:
{{- range $key, $value := . }} {{- range $key, $value := (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.controller.deploymentLabels) }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
app.kubernetes.io/component: {{ .Values.controller.component }} app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }} {{- include "argo-rollouts.labels" . | nindent 4 }}

4
charts/argo-rollouts/templates/dashboard/deployment.yaml
View file

@ -10,11 +10,9 @@ metadata:
{{- end }} {{- end }}
name: {{ include "argo-rollouts.fullname" . }}-dashboard name: {{ include "argo-rollouts.fullname" . }}-dashboard
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
{{- with (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.dashboard.deploymentLabels) }}
labels: labels:
{{- range $key, $value := . }} {{- range $key, $value := (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.dashboard.deploymentLabels) }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
app.kubernetes.io/component: {{ .Values.dashboard.component }} app.kubernetes.io/component: {{ .Values.dashboard.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }} {{- include "argo-rollouts.labels" . | nindent 4 }}