From f7baf1599d1d722b87f1c7baf2f963417cff54db Mon Sep 17 00:00:00 2001
From: paulportela <wcoportelap@gmail.com>
Date: Fri, 28 May 2021 17:22:27 -0700
Subject: [PATCH] Fix adding private repository
`imageRepos` field was removed and the project no longer tries to compose image strings. Now the libraries use `$.values.common.images` to override default images.
---
jsonnet/kube-prometheus/addons/config-mixins.libsonnet | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/jsonnet/kube-prometheus/addons/config-mixins.libsonnet b/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
index 79f25044..ca2f4468 100644
--- a/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
+++ b/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
@@ -18,13 +18,15 @@ local imageName(image) =
// quay.io/coreos/addon-resizer -> $repository/addon-resizer
// grafana/grafana -> grafana $repository/grafana
local withImageRepository(repository) = {
- local oldRepos = super._config.imageRepos,
+ local oldRepos = super.values.common.images,
local substituteRepository(image, repository) =
if repository == null then image else repository + '/' + imageName(image),
values+:: {
- imageRepos:: {
- [field]: substituteRepository(oldRepos[field], repository)
- for field in std.objectFields(oldRepos)
+ common+:: {
+ images:: {
+ [field]: substituteRepository(oldRepos[field], repository)
+ for field in std.objectFields(oldRepos)
+ },
},
},
};
--
GitLab