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

Fixes version label in argocd components

Browse source 
Breaking change introduced in this PR https://github.com/argoproj/argo-helm/pull/203 causes labeles to be removed due to an empty vaule in .Values.*.image.tag.
This commit is contained in:
Jaret Deprin 2020-01-15 09:44:07 -08:00
parent 69208d2a6f
commit 937ec80103
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -1,3 +1,4 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -9,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.controller.name }} app.kubernetes.io/component: {{ .Values.controller.name }}
app.kubernetes.io/version: {{ .Values.controller.image.tag }} app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -32,7 +33,7 @@ spec:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.controller.name }} app.kubernetes.io/component: {{ .Values.controller.name }}
app.kubernetes.io/version: {{ .Values.controller.image.tag }} app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
{{- if .Values.controller.podLabels }} {{- if .Values.controller.podLabels }}
{{- toYaml .Values.controller.podLabels | nindent 8 }} {{- toYaml .Values.controller.podLabels | nindent 8 }}
{{- end }} {{- end }}

4
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.repoServer.name }} app.kubernetes.io/component: {{ .Values.repoServer.name }}
app.kubernetes.io/version: {{ .Values.repoServer.image.tag }} app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -32,7 +32,7 @@ spec:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.repoServer.name }} app.kubernetes.io/component: {{ .Values.repoServer.name }}
app.kubernetes.io/version: {{ .Values.repoServer.image.tag }} app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
{{- if .Values.controller.podLabels }} {{- if .Values.controller.podLabels }}
{{- toYaml .Values.controller.podLabels | nindent 8 }} {{- toYaml .Values.controller.podLabels | nindent 8 }}
{{- end }} {{- end }}

4
charts/argo-cd/templates/argocd-server/deployment.yaml
View file

@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
app.kubernetes.io/version: {{ .Values.server.image.tag }} app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -32,7 +32,7 @@ spec:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
app.kubernetes.io/version: {{ .Values.server.image.tag }} app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
{{- if .Values.controller.podLabels }} {{- if .Values.controller.podLabels }}
{{- toYaml .Values.controller.podLabels | nindent 8 }} {{- toYaml .Values.controller.podLabels | nindent 8 }}
{{- end }} {{- end }}