feat: streamlining other namespace selectors, setting automountServic…

…eAccountToken null thanks to prometheus-community/helm-charts#5051
cloudogu · Jan 9, 2025 · dd9cd1d · dd9cd1d
1 parent a8dc547
commit dd9cd1d
Showing 1 changed file with 34 additions and 3 deletions.
diff --git a/applications/cluster-resources/monitoring/prometheus-stack-helm-values.ftl.yaml b/applications/cluster-resources/monitoring/prometheus-stack-helm-values.ftl.yaml
@@ -267,6 +267,7 @@ grafana:
 prometheus:
   prometheusSpec:
     <#if config.application.openshift == true>
+    automountServiceAccountToken: null
     securityContext: 
       fsGroup: null
       runAsGroup: null
@@ -287,14 +288,44 @@ prometheus:
           </#if>
     serviceMonitorSelectorNilUsesHelmValues: false
     podMonitorNamespaceSelector:
-      matchLabels: {}
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: In
+          values:
+          <#if namespaces?has_content>
+          <#list namespaces as namespace>
+          - ${namespace}
+          </#list>
+          <#else>
+          { }
+          </#if>
     podMonitorSelectorNilUsesHelmValues: false
     ruleNamespaceSelector:
-      matchLabels: {}
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: In
+          values:
+          <#if namespaces?has_content>
+          <#list namespaces as namespace>
+          - ${namespace}
+          </#list>
+          <#else>
+          { }
+          </#if>
     ruleSelectorNilUsesHelmValues: false
     scrapeConfigSelectorNilUsesHelmValues: false
     probeNamespaceSelector:
-      matchLabels: {}
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: In
+          values:
+          <#if namespaces?has_content>
+          <#list namespaces as namespace>
+          - ${namespace}
+          </#list>
+          <#else>
+          { }
+          </#if>
     probeSelectorNilUsesHelmValues: false
   <#if podResources == true>
     resources: