[kube-prometheus-stack] Implement POC basing on @jkroepke's 2nd sugge…

…stion in #4818 #4818 (comment) Signed-off-by: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
prometheus-community · Aug 29, 2024 · b83ccf1 · b83ccf1
1 parent 739fe4c
commit b83ccf1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 62.4.0
+version: 63.0.0
 appVersion: v0.76.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md
@@ -82,6 +82,10 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
 
 A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
 
+### From 62.x to 63.x
+
+TODO
+
 ### From 61.x to 62.x
 
 This version upgrades Prometheus-Operator to v0.76.0

diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
@@ -246,9 +246,8 @@ spec:
   ruleSelector: {}
 {{- end }}
 {{- end }}
-{{- if not (eq .Values.prometheus.prometheusSpec.scrapeConfigSelector nil)}}
-  scrapeConfigSelector:
-      {{- tpl (toYaml .Values.prometheus.prometheusSpec.scrapeConfigSelector | indent 4) . | nindent 2 }}
+{{- if not (kindIs "invalid" .Values.prometheus.prometheusSpec.scrapeConfigSelector) }}
+  scrapeConfigSelector: {{ tpl (toYaml .Values.prometheus.prometheusSpec.scrapeConfigSelector) . | nindent 4 }}
 {{- end }}
 {{- if .Values.prometheus.prometheusSpec.storageSpec }}
   storage:

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -3683,14 +3683,11 @@ prometheus:
     #   matchLabels:
     #     prometheus: somelabel
 
-    ## If true, a nil or {} value for prometheus.prometheusSpec.scrapeConfigSelector will cause the
-    ## prometheus resource to be created with selectors based on values in the helm deployment,
-    ## which will also match the scrapeConfigs created
-    ##
-    scrapeConfigSelectorNilUsesHelmValues: true
-
     ## scrapeConfigs to be selected for target discovery.
-    ## If {}, select all scrapeConfigs
+    ## If matchLabels.release: "{{ $.Release.Name }}" the prometheus resource will be created
+    ## with selectors based on values in the helm deployment, which will also match the scrapeConfigs created
+    ## If matchLabels: null" select all scrapeConfigs
+    ## If null, exclude the field from the prometheusSpec (keeping  downward compatibility with older versions of CRD)
     ##
     scrapeConfigSelector:
       matchLabels: