[prometheus-blackbox-exporter] Adjust configPath handling

Signed-off-by: Jakob Hahn <[email protected]>
prometheus-community · Oct 15, 2024 · b14e213 · b14e213
1 parent 0529c10
commit b14e213
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Prometheus Blackbox Exporter
 name: prometheus-blackbox-exporter
-version: 9.0.1
+version: 10.0.0
 appVersion: v0.25.0
 kubeVersion: ">=1.21.0-0"
 home: https://github.com/prometheus/blackbox_exporter

diff --git a/charts/prometheus-blackbox-exporter/README.md b/charts/prometheus-blackbox-exporter/README.md
@@ -48,6 +48,12 @@ helm upgrade [RELEASE_NAME] [CHART] --install
 
 _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
 
+### To 10.0.0
+
+This version changed the config path handing.
+- The `configPath` value overwrites the default config path.
+- The default value, if no `config` is defined, got removed. You can set the removed default `/etc/blackbox_exporter/config.yml` via the `configPath` value.
+
 ### To 9.0.0
 
 This version remove pod security policy as it is deprecated.

diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl
@@ -228,15 +228,7 @@ containers:
   {{- end }}
   {{- end }}
   args:
-  {{- if .Values.config }}
-  {{- if .Values.configPath }}
-  - "--config.file={{ .Values.configPath }}"
-  {{- else }}
-  - "--config.file=/config/blackbox.yaml"
-  {{- end }}
-  {{- else }}
-  - "--config.file=/etc/blackbox_exporter/config.yml"
-  {{- end }}
+  - --config-file={{ .Values.configPath | default "/config/blackbox.yaml" }}
   {{- with .Values.extraArgs }}
 {{ tpl (toYaml .) $ | indent 2 }}
   {{- end }}