From 9e8926511f3911427dc575672fde9b5696d39117 Mon Sep 17 00:00:00 2001
From: Abhilash Pallerlamudi <stp.abhi@gmail.com>
Date: Mon, 23 Aug 2021 12:45:51 -0700
Subject: [PATCH] fix sync-to-internal-registry.jsonnet
---
.../addons/config-mixins.libsonnet | 4 ++++
sync-to-internal-registry.jsonnet | 15 +++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/jsonnet/kube-prometheus/addons/config-mixins.libsonnet b/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
index ca2f4468..874123a4 100644
--- a/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
+++ b/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
@@ -31,6 +31,10 @@ local withImageRepository(repository) = {
},
};
+{
+ imageName:: imageName,
+}
+
{
withImageRepository:: withImageRepository,
}
diff --git a/sync-to-internal-registry.jsonnet b/sync-to-internal-registry.jsonnet
index b7c85571..88446d0b 100644
--- a/sync-to-internal-registry.jsonnet
+++ b/sync-to-internal-registry.jsonnet
@@ -1,17 +1,16 @@
-local kp = import 'kube-prometheus/kube-prometheus.libsonnet';
-local l = import 'kube-prometheus/lib/lib.libsonnet';
-local config = kp._config;
+local kp = import 'kube-prometheus/main.libsonnet';
+local l = import 'kube-prometheus/addons/config-mixins.libsonnet';
+local config = kp.values.common;
local makeImages(config) = [
{
- name: config.imageRepos[image],
- tag: config.versions[image],
+ name: config.images[image],
}
- for image in std.objectFields(config.imageRepos)
+ for image in std.objectFields(config.images)
];
-local upstreamImage(image) = '%s:%s' % [image.name, image.tag];
-local downstreamImage(registry, image) = '%s/%s:%s' % [registry, l.imageName(image.name), image.tag];
+local upstreamImage(image) = '%s' % [image.name];
+local downstreamImage(registry, image) = '%s/%s' % [registry, l.imageName(image.name)];
local pullPush(image, newRegistry) = [
'docker pull %s' % upstreamImage(image),
--
GitLab