From b14e213b540cf7edadc443d318e287c1dee48436 Mon Sep 17 00:00:00 2001 From: Jakob Hahn Date: Tue, 15 Oct 2024 14:42:15 +0200 Subject: [PATCH 1/2] [prometheus-blackbox-exporter] Adjust configPath handling Signed-off-by: Jakob Hahn --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- charts/prometheus-blackbox-exporter/README.md | 6 ++++++ .../templates/_helpers.tpl | 10 +--------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index da040c655ca3..5d7ed9d47ef8 100644 --- 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 index 99e9298648e1..3fac386c87ca 100644 --- 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 index dd04f3129705..01648155256f 100644 --- 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 }} From 04baa2b5e6dd2f13700df8f2d77e815688706c83 Mon Sep 17 00:00:00 2001 From: Jakob Hahn Date: Tue, 15 Oct 2024 16:22:20 +0200 Subject: [PATCH 2/2] [prometheus-blackbox-exporter] fix typo in config arg Signed-off-by: Jakob Hahn --- charts/prometheus-blackbox-exporter/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl index 01648155256f..ec48356b3c12 100644 --- a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl +++ b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl @@ -228,7 +228,7 @@ containers: {{- end }} {{- end }} args: - - --config-file={{ .Values.configPath | default "/config/blackbox.yaml" }} + - --config.file={{ .Values.configPath | default "/config/blackbox.yaml" }} {{- with .Values.extraArgs }} {{ tpl (toYaml .) $ | indent 2 }} {{- end }}