From b43ba86f940d42f076bd45f9da3553807920535b Mon Sep 17 00:00:00 2001
From: Liviu Costea <liviu.costea@mambu.com>
Date: Fri, 1 Feb 2019 18:52:14 +0200
Subject: [PATCH] Clean the old label, use only latest recommendations

Follow the ideas and changes of https://github.com/argoproj/argo-cd/pull/1035
---
 .../templates/argocd-application-controller-deployment.yaml | 3 ---
 .../templates/argocd-application-controller-service.yaml    | 1 -
 charts/argo-cd/templates/argocd-cm.yaml                     | 4 +---
 charts/argo-cd/templates/argocd-metrics-service.yaml        | 1 -
 charts/argo-cd/templates/argocd-rbac-cm.yaml                | 6 ++++++
 charts/argo-cd/templates/argocd-repo-server-deployment.yaml | 3 ---
 charts/argo-cd/templates/argocd-repo-server-service.yaml    | 2 --
 charts/argo-cd/templates/argocd-secret.yaml                 | 4 +---
 charts/argo-cd/templates/argocd-server-deployment.yaml      | 3 ---
 charts/argo-cd/templates/argocd-server-role.yaml            | 1 -
 charts/argo-cd/templates/argocd-server-rolebinding.yaml     | 1 -
 charts/argo-cd/templates/argocd-server-sa.yaml              | 1 -
 charts/argo-cd/templates/argocd-server-service.yaml         | 2 --
 13 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller-deployment.yaml b/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
index 40aaa0ec..860bf0f1 100755
--- a/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: {{ include "argo-cd.fullname" . }}-application-controller
   labels:
-    app: {{ include "argo-cd.name" . }}-application-controller
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -13,12 +12,10 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ include "argo-cd.name" . }}-application-controller
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
   template:
     metadata:
       labels:
-        app: {{ include "argo-cd.name" . }}-application-controller
         app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
         helm.sh/chart: {{ include "argo-cd.chart" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-application-controller-service.yaml b/charts/argo-cd/templates/argocd-application-controller-service.yaml
index 6d3eb3ec..50f191d5 100755
--- a/charts/argo-cd/templates/argocd-application-controller-service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-service.yaml
@@ -14,5 +14,4 @@ spec:
   - port: {{ .Values.applicationController.servicePort }}
     targetPort: {{ .Values.applicationController.containerPort }}
   selector:
-    app: {{ include "argo-cd.name" . }}-application-controller
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml
index 0a44c53d..306ae024 100755
--- a/charts/argo-cd/templates/argocd-cm.yaml
+++ b/charts/argo-cd/templates/argocd-cm.yaml
@@ -3,13 +3,11 @@ kind: ConfigMap
 metadata:
   name: {{ include "argo-cd.fullname" . }}-cm
   labels: 
-    app: {{ include "argo-cd.name" . }}-server
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
-    app.kubernetes.io/component: server
 data:
 {{- if .Values.config.helmRepositories }}
   helm.repositories: |
diff --git a/charts/argo-cd/templates/argocd-metrics-service.yaml b/charts/argo-cd/templates/argocd-metrics-service.yaml
index cd602581..63fad0e5 100755
--- a/charts/argo-cd/templates/argocd-metrics-service.yaml
+++ b/charts/argo-cd/templates/argocd-metrics-service.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: {{ include "argo-cd.name" . }}-metrics
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-rbac-cm.yaml
index a07decab..d5dc6c5f 100755
--- a/charts/argo-cd/templates/argocd-rbac-cm.yaml
+++ b/charts/argo-cd/templates/argocd-rbac-cm.yaml
@@ -2,6 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "argo-cd.fullname" . }}-rbac-cm
+  labels:
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
 data:
 {{- if .Values.rbac.policy-default }}
   policy.default: {{ .Values.rbac.policy-default }}
diff --git a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
index 98a01726..de7664bb 100755
--- a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: {{ include "argo-cd.fullname" . }}-repo-server
   labels:
-    app: {{ include "argo-cd.name" . }}-repo-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -13,12 +12,10 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ include "argo-cd.name" . }}-repo-server
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
   template:
     metadata:
       labels:
-        app: {{ include "argo-cd.name" . }}-repo-server
         app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
         helm.sh/chart: {{ include "argo-cd.chart" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-repo-server-service.yaml b/charts/argo-cd/templates/argocd-repo-server-service.yaml
index 05f5d1ea..8b540d0e 100755
--- a/charts/argo-cd/templates/argocd-repo-server-service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server-service.yaml
@@ -3,7 +3,6 @@ kind: Service
 metadata:
   name: {{ include "argo-cd.fullname" . }}-repo-server
   labels:
-    app: {{ include "argo-cd.name" . }}-repo-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -15,5 +14,4 @@ spec:
   - port: {{ .Values.repoServer.servicePort }}
     targetPort: {{ .Values.repoServer.servicePort }}
   selector:
-    app: {{ include "argo-cd.name" . }}-repo-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
diff --git a/charts/argo-cd/templates/argocd-secret.yaml b/charts/argo-cd/templates/argocd-secret.yaml
index 3fbebd44..c4a5000d 100755
--- a/charts/argo-cd/templates/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-secret.yaml
@@ -3,13 +3,11 @@ kind: Secret
 metadata:
   name: {{ include "argo-cd.fullname" . }}-secret
   labels: 
-    app: {{ include "argo-cd.name" . }}-server
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
-    app.kubernetes.io/component: server
 type: Opaque
 data:  
 {{- if .Values.config.webhook.githubSecret }}
diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml
index 7f07bd55..c29b1ab5 100755
--- a/charts/argo-cd/templates/argocd-server-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server-deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: {{ include "argo-cd.fullname" . }}-server
   labels:
-    app: {{ include "argo-cd.name" . }}-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -13,12 +12,10 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ include "argo-cd.name" . }}-server
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
   template:
     metadata:
       labels:
-        app: {{ include "argo-cd.name" . }}-server
         app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
         helm.sh/chart: {{ include "argo-cd.chart" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-server-role.yaml b/charts/argo-cd/templates/argocd-server-role.yaml
index d0765299..18339313 100755
--- a/charts/argo-cd/templates/argocd-server-role.yaml
+++ b/charts/argo-cd/templates/argocd-server-role.yaml
@@ -3,7 +3,6 @@ kind: Role
 metadata:
   name: {{ include "argo-cd.fullname" . }}-server
   labels:
-    app: {{ include "argo-cd.name" . }}-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-server-rolebinding.yaml b/charts/argo-cd/templates/argocd-server-rolebinding.yaml
index 73f8e963..d91a32fd 100755
--- a/charts/argo-cd/templates/argocd-server-rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-server-rolebinding.yaml
@@ -3,7 +3,6 @@ kind: RoleBinding
 metadata:
   name: {{ include "argo-cd.fullname" . }}-server
   labels:
-    app: {{ include "argo-cd.name" . }}-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-server-sa.yaml b/charts/argo-cd/templates/argocd-server-sa.yaml
index 7b29a38e..5f4f4f3b 100755
--- a/charts/argo-cd/templates/argocd-server-sa.yaml
+++ b/charts/argo-cd/templates/argocd-server-sa.yaml
@@ -3,7 +3,6 @@ kind: ServiceAccount
 metadata:
   name: {{ include "argo-cd.fullname" . }}-server
   labels:
-    app: {{ include "argo-cd.name" . }}-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/argo-cd/templates/argocd-server-service.yaml b/charts/argo-cd/templates/argocd-server-service.yaml
index 961e1d86..ce6dfa75 100755
--- a/charts/argo-cd/templates/argocd-server-service.yaml
+++ b/charts/argo-cd/templates/argocd-server-service.yaml
@@ -3,7 +3,6 @@ kind: Service
 metadata:
   name: {{ include "argo-cd.fullname" . }}-server
   labels:
-    app: {{ include "argo-cd.name" . }}-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -21,6 +20,5 @@ spec:
     port: {{ .Values.repoServer.servicePortHttps }}
     targetPort: {{ .Values.repoServer.containerPort }}
   selector:
-    app: {{ include "argo-cd.name" . }}-server
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server