From 2531c043dc5bf2727934dba992707846bee7e15c Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Mon, 3 May 2021 10:01:37 +0200
Subject: [PATCH] jsonnet: fix conflict resolution
---
.../kube-prometheus/components/blackbox-exporter.libsonnet | 5 ++---
jsonnet/kube-prometheus/versions.json | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
index 8bed7b84..074a9f34 100644
--- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
@@ -20,9 +20,8 @@ local defaults = {
for labelName in std.objectFields(defaults.commonLabels)
if !std.setMember(labelName, ['app.kubernetes.io/version'])
},
- configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0',
- kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
-
+ configmapReloaderImage: error 'must provide version',
+ kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
port: 9115,
internalPort: 19115,
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index d0bfa160..2a7e6ea0 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -7,6 +7,6 @@
"prometheus": "2.26.0",
"prometheusAdapter": "0.8.4",
"prometheusOperator": "0.47.0",
- "kubeRbacProxy": "0.8.0"
+ "kubeRbacProxy": "0.8.0",
"configmapReload": "0.5.0"
-}
\ No newline at end of file
+}
--
GitLab