From f0438e7f80d1d19d2953eff382f268db01cc3eef Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Fri, 22 Feb 2019 18:39:19 +0100
Subject: [PATCH] kube-prometheus: node-exporter tolerates any node
---
.../node-exporter/node-exporter.libsonnet | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index 93c90a1f..6b7f7f8a 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -66,9 +66,13 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local podLabels = { app: 'node-exporter' };
- local masterToleration = toleration.new() +
- toleration.withEffect('NoSchedule') +
- toleration.withKey('node-role.kubernetes.io/master');
+ local noExecuteToleration = toleration.new() +
+ toleration.withOperator('Exists') +
+ toleration.withEffect('NoExecute');
+
+ local noScheduleToleration = toleration.new() +
+ toleration.withOperator('Exists') +
+ toleration.withEffect('NoSchedule');
local procVolumeName = 'proc';
local procVolume = volume.fromHostPath(procVolumeName, '/proc');
@@ -132,7 +136,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
daemonset.mixin.metadata.withLabels(podLabels) +
daemonset.mixin.spec.selector.withMatchLabels(podLabels) +
daemonset.mixin.spec.template.metadata.withLabels(podLabels) +
- daemonset.mixin.spec.template.spec.withTolerations([masterToleration]) +
+ daemonset.mixin.spec.template.spec.withTolerations([noExecuteToleration, noScheduleToleration]) +
daemonset.mixin.spec.template.spec.withNodeSelector({ 'beta.kubernetes.io/os': 'linux' }) +
daemonset.mixin.spec.template.spec.withContainers(c) +
daemonset.mixin.spec.template.spec.withVolumes([procVolume, sysVolume, rootVolume]) +
--
GitLab