From 4e586fb3c60cc1476dbdfca5f8ea8b353bba3896 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Mon, 17 Jun 2019 21:28:35 +0200
Subject: [PATCH] make node_exporter pods tolerate every taint
---
.../node-exporter/node-exporter.libsonnet | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index 6b7f7f8a..629c17d3 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -66,14 +66,8 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local podLabels = { app: 'node-exporter' };
- local noExecuteToleration = toleration.new() +
- toleration.withOperator('Exists') +
- toleration.withEffect('NoExecute');
-
- local noScheduleToleration = toleration.new() +
- toleration.withOperator('Exists') +
- toleration.withEffect('NoSchedule');
-
+ local existsToleration = toleration.new() +
+ toleration.withOperator('Exists')
local procVolumeName = 'proc';
local procVolume = volume.fromHostPath(procVolumeName, '/proc');
local procVolumeMount = containerVolumeMount.new(procVolumeName, '/host/proc');
@@ -136,7 +130,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([noExecuteToleration, noScheduleToleration]) +
+ daemonset.mixin.spec.template.spec.withTolerations([existsToleration]) +
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