From be2964887f96d37bbb052fb6e5151f5cb988cb58 Mon Sep 17 00:00:00 2001
From: "Nagel, Felix" <felix.nagel@sew-eurodrive.de>
Date: Fri, 30 Apr 2021 12:46:48 +0200
Subject: [PATCH] can change configmapReload over $.values.common.images
---
.../kube-prometheus/components/blackbox-exporter.libsonnet | 2 +-
jsonnet/kube-prometheus/main.libsonnet | 3 +++
jsonnet/kube-prometheus/versions.json | 5 +++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
index e574c9f2..71af4056 100644
--- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
@@ -20,7 +20,7 @@ local defaults = {
for labelName in std.objectFields(defaults.commonLabels)
if !std.setMember(labelName, ['app.kubernetes.io/version'])
},
- configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0',
+ configmapReloaderImage: error 'must provide version',
port: 9115,
internalPort: 19115,
diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet
index 1c13b7b9..d35ce215 100644
--- a/jsonnet/kube-prometheus/main.libsonnet
+++ b/jsonnet/kube-prometheus/main.libsonnet
@@ -30,6 +30,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
prometheus: error 'must provide version',
prometheusAdapter: error 'must provide version',
prometheusOperator: error 'must provide version',
+ configmapReload: error 'must provide version'
} + (import 'versions.json'),
images: {
alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
@@ -41,6 +42,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
prometheusAdapter: 'directxman12/k8s-prometheus-adapter:v' + $.values.common.versions.prometheusAdapter,
prometheusOperator: 'quay.io/prometheus-operator/prometheus-operator:v' + $.values.common.versions.prometheusOperator,
prometheusOperatorReloader: 'quay.io/prometheus-operator/prometheus-config-reloader:v' + $.values.common.versions.prometheusOperator,
+ configmapReload: 'jimmidyson/configmap-reload:v' + $.values.common.versions.configmapReload,
},
},
alertmanager: {
@@ -54,6 +56,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
namespace: $.values.common.namespace,
version: $.values.common.versions.blackboxExporter,
image: $.values.common.images.blackboxExporter,
+ configmapReloaderImage: $.values.common.images.configmapReload,
},
grafana: {
namespace: $.values.common.namespace,
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 72f91628..892e6053 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -6,5 +6,6 @@
"nodeExporter": "1.1.2",
"prometheus": "2.26.0",
"prometheusAdapter": "0.8.4",
- "prometheusOperator": "0.47.0"
-}
+ "prometheusOperator": "0.47.0",
+ "configmapReload": "0.5.0"
+}
\ No newline at end of file
--
GitLab