Add components to selectlabels

Signed-off-by: Hui Kang <hui.kang@salesforce.com>

charts/argo-rollouts/Chart.yaml

@@ -4,7 +4,6 @@ description: A Helm chart for Argo Rollouts
 name: argo-rollouts
 version: 1.1.0
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
-)
 home: https://github.com/argoproj/argo-helm
 maintainers:
   - name: alexmt

charts/argo-rollouts/templates/_helpers.tpl

@@ -52,14 +52,6 @@ app.kubernetes.io/name: {{ include "argo-rollouts.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Selector labels: dashboard
-*/}}
-{{- define "argo-rollouts.selectorLabels-dashboard" -}}
-app.kubernetes.io/name: {{ include "argo-rollouts.name" . }}-dashboard
-app.kubernetes.io/instance: {{ .Release.Name }}-dashboard
-{{- end }}
-
 {{/*
 Create the name of the service account to use
 */}}

charts/argo-rollouts/templates/argo-rollouts-deployment.yaml

@@ -8,6 +8,7 @@ metadata:
 spec:
   selector:
     matchLabels:
+      app.kubernetes.io/component: {{ .Values.controller.component }}
       {{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
   strategy:
     type: Recreate
@@ -19,6 +20,7 @@ spec:
       {{- end }}
       labels:
         {{- include "argo-rollouts.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: {{ .Values.controller.component }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}

charts/argo-rollouts/templates/argo-rollouts-metrics-service.yaml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ include "argo-rollouts.fullname" . }}-metrics
   labels:
-    app.kubernetes.io/component: server
+    app.kubernetes.io/component: {{ .Values.controller.component }}
     {{- include "argo-rollouts.labels" . | nindent 4 }}
   {{- with .Values.serviceAnnotations }}
   annotations:
@@ -17,5 +17,6 @@ spec:
     port: 8090
     targetPort: 8090
   selector:
-    {{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
+    app.kubernetes.io/component: {{ .Values.controller.component }}
+    {{- include "argo-rollouts.selectorLabels" . | nindent 4 }}
 {{- end }}

charts/argo-rollouts/templates/dashboard/deployment.yaml

@@ -9,7 +9,8 @@ metadata:
 spec:
   selector:
     matchLabels:
-      {{- include "argo-rollouts.selectorLabels-dashboard" . | nindent 6 }}
+      {{- include "argo-rollouts.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: {{ .Values.dashboard.component }}
   strategy:
     type: Recreate
   template:
@@ -19,7 +20,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "argo-rollouts.selectorLabels-dashboard" . | nindent 8 }}
+        {{- include "argo-rollouts.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: {{ .Values.dashboard.component }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}

charts/argo-rollouts/templates/dashboard/service.yaml

@@ -17,6 +17,6 @@ spec:
     port: 3100
     targetPort: 3100
   selector:
-    # app.kubernetes.io/component: {{ .Values.dashboard.component }}
-    {{- include "argo-rollouts.selectorLabels-dashboard" . | nindent 6 }}
+    app.kubernetes.io/component: {{ .Values.dashboard.component }}
+    {{- include "argo-rollouts.selectorLabels" . | nindent 4 }}
 {{- end }}

charts/argo-rollouts/values.yaml

@@ -25,7 +25,7 @@ controller:
   #    memory: 64Mi
 
   metrics:
-    enabled: false
+    enabled: true
     serviceMonitor:
       enabled: false
       additionalLabels: {}