From 630bc3118399d28ade31313ff929c86b4a32dd98 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Tue, 5 Jan 2021 16:11:37 +0100
Subject: [PATCH] jsonnet: do not compose image string for node-exporter

---
 jsonnet/kube-prometheus/kube-prometheus.libsonnet            | 2 +-
 .../kube-prometheus/node-exporter/node-exporter.libsonnet    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 1def6a56..daab5bcc 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -21,7 +21,7 @@ local nodeExporter = import './node-exporter/node-exporter.libsonnet';
   nodeExporter: nodeExporter({
     namespace: $._config.namespace,
     version: '1.0.1',
-    imageRepo: 'quay.io/prometheus/node-exporter',
+    image: 'quay.io/prometheus/node-exporter:v1.0.1',
   }),
   kubePrometheus+:: {
     namespace: {
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index 9100133c..63ec53b9 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -4,8 +4,7 @@ local defaults = {
   local defaults = self,
   namespace: error 'must provide namespace',
   version: error 'must provide version',
-  imageRepo: error 'must provide version',
-  // image: "",
+  image: error 'must provide version',
   resources: {
     requests: { cpu: '102m', memory: '180Mi' },
     limits: { cpu: '250m', memory: '180Mi' },
@@ -135,7 +134,7 @@ function(params) {
   daemonset:
     local nodeExporter = {
       name: 'node-exporter',
-      image: ne.config.imageRepo + ':v' + ne.config.version,
+      image: ne.config.image,
       args: [
         '--web.listen-address=' + std.join(':', [ne.config.listenAddress, std.toString(ne.config.port)]),
         '--path.sysfs=/host/sys',
-- 
GitLab