From 432db2c79935e4afc5f7336dd0bec35a8f6eaab1 Mon Sep 17 00:00:00 2001
From: Zack Brenton <zack@jnickel.com>
Date: Mon, 6 Apr 2020 13:54:17 -0300
Subject: [PATCH] use top-level config for all nodeExporter selector labels
---
.../node-exporter/node-exporter.libsonnet | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index c5004cdb..cf55c02a 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -20,6 +20,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
'app.kubernetes.io/name': 'node-exporter',
'app.kubernetes.io/version': $._config.versions.nodeExporter,
},
+ selectorLabels: {
+ [labelName]: $._config.nodeExporter.labels[labelName]
+ for labelName in std.objectFields($._config.nodeExporter.labels)
+ if !std.setMember(labelName, ['app.kubernetes.io/version'])
+ },
},
},
@@ -69,11 +74,7 @@ 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 selectorLabels = $._config.nodeExporter.selectorLabels;
local existsToleration = toleration.new() +
toleration.withOperator('Exists');
@@ -168,7 +169,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
spec: {
jobLabel: 'app.kubernetes.io/name',
selector: {
- matchLabels: $._config.nodeExporter.labels,
+ matchLabels: $._config.nodeExporter.selectorLabels,
},
endpoints: [
{
@@ -199,7 +200,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local nodeExporterPort = servicePort.newNamed('https', $._config.nodeExporter.port, 'https');
- service.new('node-exporter', $.nodeExporter.daemonset.spec.selector.matchLabels, nodeExporterPort) +
+ service.new('node-exporter', $._config.nodeExporter.selectorLabels, nodeExporterPort) +
service.mixin.metadata.withNamespace($._config.namespace) +
service.mixin.metadata.withLabels($._config.nodeExporter.labels) +
service.mixin.spec.withClusterIp('None'),
--
GitLab