From a00f6bbf70eb3f54e5cb82ffc1c1fd6d28d60c48 Mon Sep 17 00:00:00 2001 From: Firas Mosbehi Date: Fri, 6 Mar 2026 10:34:19 +0100 Subject: [PATCH 1/2] prometheus-blackbox-exporter: add ServiceMonitor apiVersion override Signed-off-by: Firas Mosbehi --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- .../templates/selfservicemonitor.yaml | 2 +- .../templates/servicemonitor.yaml | 2 +- charts/prometheus-blackbox-exporter/values.yaml | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index e5f305dcca57..8e704026724c 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: 11.8.0 +version: 11.8.1 # renovate: github=prometheus/blackbox_exporter appVersion: v0.28.0 kubeVersion: ">=1.21.0-0" diff --git a/charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml b/charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml index 61db72dac66c..82b7a00df534 100644 --- a/charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml +++ b/charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml @@ -1,6 +1,6 @@ {{- if .Values.serviceMonitor.selfMonitor.enabled }} --- -apiVersion: monitoring.coreos.com/v1 +apiVersion: {{ .Values.serviceMonitor.apiVersion }} kind: ServiceMonitor metadata: name: {{ template "prometheus-blackbox-exporter.fullname" $ }} diff --git a/charts/prometheus-blackbox-exporter/templates/servicemonitor.yaml b/charts/prometheus-blackbox-exporter/templates/servicemonitor.yaml index 62b9662858ea..1980d69206c2 100644 --- a/charts/prometheus-blackbox-exporter/templates/servicemonitor.yaml +++ b/charts/prometheus-blackbox-exporter/templates/servicemonitor.yaml @@ -1,7 +1,7 @@ {{- if .Values.serviceMonitor.enabled }} {{- range .Values.serviceMonitor.targets }} --- -apiVersion: monitoring.coreos.com/v1 +apiVersion: {{ $.Values.serviceMonitor.apiVersion }} kind: ServiceMonitor metadata: name: {{ template "prometheus-blackbox-exporter.fullname" $ }}-{{ .name }} diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml index d4787a6fcd03..4fe32c76dd35 100644 --- a/charts/prometheus-blackbox-exporter/values.yaml +++ b/charts/prometheus-blackbox-exporter/values.yaml @@ -278,6 +278,10 @@ extraArgs: [] replicas: 1 serviceMonitor: + ## ServiceMonitor CRD API version + ## + apiVersion: monitoring.coreos.com/v1 + ## If true, a ServiceMonitor CRD is created for a prometheus operator ## https://github.com/coreos/prometheus-operator for blackbox-exporter itself ## From e6a91cb78872b1fb24c2baf20d0580c856a1c7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 10 Mar 2026 11:11:55 +0100 Subject: [PATCH 2/2] Update charts/prometheus-blackbox-exporter/Chart.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index 8e704026724c..a54cb486a1e5 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: 11.8.1 +version: 11.9.0 # renovate: github=prometheus/blackbox_exporter appVersion: v0.28.0 kubeVersion: ">=1.21.0-0"