From 0d907098ae3c3b4ca1be9aceace469bcccd27bea Mon Sep 17 00:00:00 2001
From: Zack Brenton <zack@jnickel.com>
Date: Thu, 2 Apr 2020 12:53:17 -0300
Subject: [PATCH] remove version label from node-exporter selectors
---
.../kube-prometheus/node-exporter/node-exporter.libsonnet | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index 264f4a08..c5004cdb 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -69,6 +69,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local containerEnv = container.envType;
local podLabels = $._config.nodeExporter.labels;
+ local selectorLabels = {
+ [labelName]: $._config.nodeExporter.labels[labelName]
+ for labelName in std.objectFields($._config.nodeExporter.labels)
+ if !std.setMember(labelName, ['app.kubernetes.io/version'])
+ };
local existsToleration = toleration.new() +
toleration.withOperator('Exists');
@@ -133,7 +138,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
daemonset.mixin.metadata.withName('node-exporter') +
daemonset.mixin.metadata.withNamespace($._config.namespace) +
daemonset.mixin.metadata.withLabels(podLabels) +
- daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
+ daemonset.mixin.spec.selector.withMatchLabels(selectorLabels) +
daemonset.mixin.spec.template.metadata.withLabels(podLabels) +
daemonset.mixin.spec.template.spec.withTolerations([existsToleration]) +
daemonset.mixin.spec.template.spec.withNodeSelector({ 'kubernetes.io/os': 'linux' }) +
--
GitLab