From a4ab2bcacb6c9b1b998d50377d2b54777e0554fd Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Wed, 7 Aug 2024 13:35:59 +1000 Subject: [PATCH 1/9] Update values.yaml Add support for custom ConfigMap entries. Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- charts/prometheus-blackbox-exporter/values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml index 64ff27beaf34..80933a6199a7 100644 --- a/charts/prometheus-blackbox-exporter/values.yaml +++ b/charts/prometheus-blackbox-exporter/values.yaml @@ -158,6 +158,13 @@ topologySpreadConstraints: [] configExistingSecretName: "" # Store the configuration as a `Secret` instead of a `ConfigMap`, useful in case it contains sensitive data secretConfig: false + +# if the configuration is managed as configMap outside the chart, +# provide the name of the configMap here. If secretConfig is set to true, configExistingConfigMapName will be ignored +# in favor of the config value. +configExistingConfigMapName: "" + +# Manage module configuration using helm. config: modules: http_2xx: From 6e0746babd0481299098601476376c20a2db7b9a Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Wed, 7 Aug 2024 14:31:17 +1000 Subject: [PATCH 2/9] Update configmap.yaml Set condition to create configMap using values.config (in line modules) or secret if existing configMap is set to empty. Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- charts/prometheus-blackbox-exporter/templates/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/prometheus-blackbox-exporter/templates/configmap.yaml b/charts/prometheus-blackbox-exporter/templates/configmap.yaml index 5b808cc82876..256c75c64059 100644 --- a/charts/prometheus-blackbox-exporter/templates/configmap.yaml +++ b/charts/prometheus-blackbox-exporter/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{- if (eq .Values.configExistingConfigMapName: "") }} {{- if and .Values.config (eq .Values.configExistingSecretName "") }} apiVersion: v1 kind: {{ if .Values.secretConfig -}} Secret {{- else -}} ConfigMap {{- end }} From 1180ce2c66383ba3523bc89a4c5bdcbcda4c741c Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Wed, 7 Aug 2024 14:36:33 +1000 Subject: [PATCH 3/9] Update Chart.yaml Update chart version Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- 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 8e16cd5dc483..da040c655ca3 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.0 +version: 9.0.1 appVersion: v0.25.0 kubeVersion: ">=1.21.0-0" home: https://github.com/prometheus/blackbox_exporter From 8a699da5f113db4d733abaa93b97744a879f356e Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Wed, 7 Aug 2024 14:48:22 +1000 Subject: [PATCH 4/9] Update Chart.yaml Update chart version Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- 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 da040c655ca3..dc4655ecb839 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: 9.0.2 appVersion: v0.25.0 kubeVersion: ">=1.21.0-0" home: https://github.com/prometheus/blackbox_exporter From 3a036f917166c41e2d2cecf6aaddf3547eaec612 Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Thu, 8 Aug 2024 07:34:16 +1000 Subject: [PATCH 5/9] Update Chart.yaml New feature updating minor version. Addressing reviewers comments. Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- 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 dc4655ecb839..7bf5ac1b4777 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.2 +version: 9.1.0 appVersion: v0.25.0 kubeVersion: ">=1.21.0-0" home: https://github.com/prometheus/blackbox_exporter From 2333bdc6c4d278bd075c476ea06555ffefdeb54e Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Thu, 8 Aug 2024 07:36:46 +1000 Subject: [PATCH 6/9] Update configmap.yaml Fixing syntax error in the template. Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- charts/prometheus-blackbox-exporter/templates/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/prometheus-blackbox-exporter/templates/configmap.yaml b/charts/prometheus-blackbox-exporter/templates/configmap.yaml index 256c75c64059..e7996614ccc0 100644 --- a/charts/prometheus-blackbox-exporter/templates/configmap.yaml +++ b/charts/prometheus-blackbox-exporter/templates/configmap.yaml @@ -15,3 +15,4 @@ metadata: blackbox.yaml: | {{ toYaml .Values.config | indent 4 }} {{- end }} +{{- end }} From 4b327c24b284e2dddad7f936376b71c5a418141a Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Thu, 26 Sep 2024 09:04:33 +1000 Subject: [PATCH 7/9] Update charts/prometheus-blackbox-exporter/templates/configmap.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for custom ConfigMap entries. Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan Co-authored-by: André Bauer Signed-off-by: Nirmal kumar Ramakrishnan --- charts/prometheus-blackbox-exporter/templates/configmap.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/prometheus-blackbox-exporter/templates/configmap.yaml b/charts/prometheus-blackbox-exporter/templates/configmap.yaml index e7996614ccc0..f7542f19ff40 100644 --- a/charts/prometheus-blackbox-exporter/templates/configmap.yaml +++ b/charts/prometheus-blackbox-exporter/templates/configmap.yaml @@ -1,5 +1,4 @@ -{{- if (eq .Values.configExistingConfigMapName: "") }} -{{- if and .Values.config (eq .Values.configExistingSecretName "") }} +{{- if and .Values.config (or (eq .Values.configExistingSecretName "") (eq .Values.configExistingConfigMapName: ""))}} apiVersion: v1 kind: {{ if .Values.secretConfig -}} Secret {{- else -}} ConfigMap {{- end }} metadata: From 0e3bb08418697c27d0e79f5b469ab0a22a693606 Mon Sep 17 00:00:00 2001 From: Nirmal kumar Ramakrishnan Date: Fri, 8 Nov 2024 09:06:22 +1100 Subject: [PATCH 8/9] Update Chart.yaml Add support for custom ConfigMap entries. Signed-off-by: Nirmal Ramakrishnan Signed-off-by: Nirmal kumar Ramakrishnan --- 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 7bf5ac1b4777..86a053ba13d2 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.1.0 +version: 9.1.1 appVersion: v0.25.0 kubeVersion: ">=1.21.0-0" home: https://github.com/prometheus/blackbox_exporter From 7a3224b4c8161788d3802e2ec15d056ccb44fc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 8 Nov 2024 10:04:52 +0100 Subject: [PATCH 9/9] 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 86a053ba13d2..008e9d4480c7 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.1.1 +version: 9.2.0 appVersion: v0.25.0 kubeVersion: ">=1.21.0-0" home: https://github.com/prometheus/blackbox_exporter