fix probe selector templating (#218)

neticdk · Apr 30, 2024 · 31ee3db · 31ee3db
1 parent c6f75e6
commit 31ee3db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 type: application
-version: "2.1.2"
+version: "2.1.3"
 appVersion: "v2.48.1"
 description: A Helm chart to install Prometheus based on Prometheus Operator
 home: https://prometheus.io/

diff --git a/charts/prometheus/README.md b/charts/prometheus/README.md
@@ -2,7 +2,7 @@
 
 # prometheus
 
-![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.48.1](https://img.shields.io/badge/AppVersion-v2.48.1-informational?style=flat-square)
+![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.48.1](https://img.shields.io/badge/AppVersion-v2.48.1-informational?style=flat-square)
 
 A Helm chart to install Prometheus based on Prometheus Operator
 

diff --git a/charts/prometheus/templates/prometheus.yaml b/charts/prometheus/templates/prometheus.yaml
@@ -12,14 +12,8 @@ spec:
   ruleSelector: {{ .Values.prometheusSpec.ruleSelector | toYaml | nindent 4 }}
   podMonitorNamespaceSelector: {{ .Values.prometheusSpec.podMonitorNamespaceSelector | toYaml | nindent 4 }}
   podMonitorSelector: {{ .Values.prometheusSpec.podMonitorSelector | toYaml | nindent 4 }}
-  {{ with .Values.prometheusSpec.probeNamespaceSelector }}
-  probeNamespaceSelector:
-    {{- . | toYaml | nindent 4 }}
-  {{ end }}
-  {{ with .Values.prometheusSpec.probeSelector }}
-  probeSelector:
-    {{- . | toYaml | nindent 4 }}
-  {{ end }}
+  probeNamespaceSelector: {{ .Values.prometheusSpec.probeNamespaceSelector | toYaml | nindent 4 }}
+  probeSelector: {{ .Values.prometheusSpec.probeSelector | toYaml | nindent 4 }}
   image: {{ .Values.prometheusSpec.image }}
   version: {{ .Values.prometheusSpec.version | quote }}
   resources: {{ .Values.prometheusSpec.resources | toYaml | nindent 4 }}