From eddfa674ce12f94bfe34a9cf151bd4a5adaab108 Mon Sep 17 00:00:00 2001
From: Jaret <jaret@saildrone.com>
Date: Wed, 15 Jan 2020 11:31:30 -0800
Subject: [PATCH] fix: Fix breaking change in 1.6.1 chart (#208)

* Fixes version label in argocd components

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.

* Update Chart.yaml

patch version bump
---
 charts/argo-cd/Chart.yaml                                    | 2 +-
 .../templates/argocd-application-controller/deployment.yaml  | 5 +++--
 charts/argo-cd/templates/argocd-repo-server/deployment.yaml  | 4 ++--
 charts/argo-cd/templates/argocd-server/deployment.yaml       | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 5e5283be..1867cece 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.6"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.6.1
+version: 1.6.2
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index 24cea3a5..286fb981 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -1,3 +1,4 @@
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -9,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     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:
   selector:
     matchLabels:
@@ -32,7 +33,7 @@ spec:
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/part-of: argocd
         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 }}
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 9795b61e..25a88aba 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     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:
   selector:
     matchLabels:
@@ -32,7 +32,7 @@ spec:
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/part-of: argocd
         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 }}
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index 1f0455f3..7f85bbec 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     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:
   selector:
     matchLabels:
@@ -32,7 +32,7 @@ spec:
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/part-of: argocd
         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 }}
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}