fix: Add the default release label for serviceMonitorSelectors and PodMonitorSelectors (#3927)

Author: rnishtala-sumo

.changelog/3927.fixed.txt

@@ -0,0 +1 @@
+fix: Add the default release label for serviceMonitorSelectors and PodMonitorSelectors

deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml

@@ -44,16 +44,18 @@ spec:
         matchLabels:
 {{ include "metrics.collector.otelcol.serviceMonitorSelector" . | indent 10 }}
 {{ else }}
-      serviceMonitorSelector: 
-{{ toYaml .Values.sumologic.metrics.collector.otelcol.serviceMonitorSelector | nindent 8 }}
+      serviceMonitorSelector:
+        matchLabels:
+          release: {{ .Release.Name }}
 {{- end }}
 {{- if not (empty (include "metrics.collector.otelcol.podMonitorSelector" .)) }}
       podMonitorSelector:
         matchLabels:
 {{ include "metrics.collector.otelcol.podMonitorSelector" . | indent 10 }}
 {{ else }}
       podMonitorSelector:
-{{ toYaml .Values.sumologic.metrics.collector.otelcol.podMonitorSelector | nindent 8 }}
+        matchLabels:
+          release: {{ .Release.Name }}
 {{- end }}
     serviceAccount: {{ template "sumologic.metadata.name.metrics.targetallocator.serviceaccount" . }}
 {{- if not (empty (include "metrics.collector.otelcol.nodeSelector" .)) }}

deploy/helm/sumologic/values.yaml

@@ -537,10 +537,16 @@ sumologic:
 
         ## Selector for ServiceMonitors used for target discovery. By default, this selects resources created by this Chart.
         ## See https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api/targetallocators.md#targetallocatorspecprometheuscr
+        ## Example
+        ## serviceMonitorSelector:
+        ##   release: sumologic
         serviceMonitorSelector: {}
 
         ## Selector for PodMonitors used for target discovery. By default, this selects resources created by this Chart.
         ## See https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api/targetallocators.md#targetallocatorspecprometheuscr
+        ## Example
+        ## podMonitorSelector:
+        ##   release: sumologic
         podMonitorSelector: {}
 
         securityContext:

tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml

@@ -25,8 +25,12 @@ spec:
     prometheusCR:
       enabled: true
       scrapeInterval: 30s
-      serviceMonitorSelector: {}
-      podMonitorSelector: {}
+      serviceMonitorSelector:
+        matchLabels:
+          release: RELEASE-NAME
+      podMonitorSelector:
+        matchLabels:
+          release: RELEASE-NAME
     serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator-sa
     nodeSelector:
       kubernetes.io/os: linux

tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml

@@ -25,8 +25,12 @@ spec:
     prometheusCR:
       enabled: true
       scrapeInterval: 30s
-      serviceMonitorSelector: {}
-      podMonitorSelector: {}
+      serviceMonitorSelector:
+        matchLabels:
+          release: RELEASE-NAME
+      podMonitorSelector:
+        matchLabels:
+          release: RELEASE-NAME
     serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator-sa
     nodeSelector:
       kubernetes.io/os: linux

tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml

@@ -25,8 +25,12 @@ spec:
     prometheusCR:
       enabled: true
       scrapeInterval: 30s
-      serviceMonitorSelector: {}
-      podMonitorSelector: {}
+      serviceMonitorSelector:
+        matchLabels:
+          release: RELEASE-NAME
+      podMonitorSelector:
+        matchLabels:
+          release: RELEASE-NAME
     serviceAccount: RELEASE-NAME-sumologic-metrics-targetallocator-sa
     nodeSelector:
       kubernetes.io/os: linux