fix(argo-cd): proper selectors for notifications metrics (#1176)

* fix(argo-cd): proper selectors for notifications metrics

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

* fix(argo-cd): harmonize selectors with appset

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

* fix(argo-cd): simplify selector in service

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

* fix(argo-cd): proper label for servicemonitor and suffixed service name

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.3.1
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 4.0.0
+version: 4.0.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,5 +21,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Update to Argo CD v2.3.1"
-    - "[Changed]: Sync CRDs of Argo CD v2.3.1"
+    - "[Fixed]: make notification-metrics service target pods properly"
+    - "[Fixed]: make notification-metrics servicemonitor target service properly"

charts/argo-cd/templates/argocd-notifications/service-metrics.yaml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ template "argo-cd.notifications.fullname" . }}-metrics
   labels:
-    {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
+    {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" "metrics") | nindent 4 }}
     {{- with .Values.notifications.metrics.service.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -14,7 +14,7 @@ metadata:
   {{- end }}
 spec:
   selector:
-    {{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.notifications.name "name" "metrics") | nindent 6 }}
+    {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}
   ports:
   - name: metrics
     port: {{ .Values.notifications.metrics.port }}

charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml

@@ -2,7 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "argo-cd.notifications.fullname" . }}-metrics
+  name: {{ template "argo-cd.notifications.fullname" . }}
   {{- if .Values.notifications.metrics.serviceMonitor.namespace }}
   namespace: {{ .Values.notifications.metrics.serviceMonitor.namespace }}
   {{- end }}