From 7e5d4196b960ce8c6cfc1c7527cc9af2d8cdd6f9 Mon Sep 17 00:00:00 2001
From: "Nagel, Felix" <felix.nagel@sew-eurodrive.de>
Date: Fri, 30 Apr 2021 14:05:23 +0200
Subject: [PATCH] can change grafanaImage over $.values.common.images
---
jsonnet/kube-prometheus/components/grafana.libsonnet | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet
index 5d2eeb5b..1fd668f3 100644
--- a/jsonnet/kube-prometheus/components/grafana.libsonnet
+++ b/jsonnet/kube-prometheus/components/grafana.libsonnet
@@ -3,8 +3,7 @@ local defaults = {
name: 'grafana',
namespace: error 'must provide namespace',
version: error 'must provide version',
- // image: error 'must provide image',
- imageRepos: 'grafana/grafana',
+ image: error 'must provide image',
resources: {
requests: { cpu: '100m', memory: '100Mi' },
limits: { cpu: '200m', memory: '200Mi' },
@@ -44,7 +43,7 @@ function(params) {
grafana: g._config.version,
},
imageRepos+:: {
- grafana: g._config.imageRepos,
+ grafana: std.split(g._config.image, ":")[0],
},
prometheus+:: {
name: g._config.prometheusName,
--
GitLab