From cfab64f66e64e720b9be7cfb394d943a62488500 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Mon, 17 Jun 2019 21:28:35 +0200
Subject: [PATCH 1/3] 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]) +

From 2fde1a442df6b6b5851c47b3bc5fb537090c570c Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 18 Jun 2019 17:46:12 +0200
Subject: [PATCH 2/3] node-exporter: Fix missing semicolon

---
 jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index 629c17d3..db6e99bf 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
@@ -67,7 +67,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
       local podLabels = { app: 'node-exporter' };
 
       local existsToleration = toleration.new() +
-                                  toleration.withOperator('Exists')
+                               toleration.withOperator('Exists');
       local procVolumeName = 'proc';
       local procVolume = volume.fromHostPath(procVolumeName, '/proc');
       local procVolumeMount = containerVolumeMount.new(procVolumeName, '/host/proc');

From 1a2883c9b3a667787a74c573edc421241e15bf21 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 18 Jun 2019 17:57:05 +0200
Subject: [PATCH 3/3] manifests: Re-generate

---
 jsonnetfile.lock.json                  | 8 ++++----
 manifests/node-exporter-daemonset.yaml | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index fa530d0d..48d91237 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
                     "subdir": "jsonnet/kube-prometheus"
                 }
             },
-            "version": "e85d2f3b64c65f81aec7093dda880376a6719fe1"
+            "version": "2fde1a442df6b6b5851c47b3bc5fb537090c570c"
         },
         {
             "name": "ksonnet",
@@ -38,7 +38,7 @@
                     "subdir": "grafonnet"
                 }
             },
-            "version": "bcd95ffa00fc4a58d34832f88f4b366effeb63ad"
+            "version": "3264a8ab6efa23d55da45ea3a3d3b39e86696c76"
         },
         {
             "name": "grafana-builder",
@@ -48,7 +48,7 @@
                     "subdir": "grafana-builder"
                 }
             },
-            "version": "de367fc28346fbf5a9afdef887ea20d9ffb7e927"
+            "version": "76258e92c20a2bca74e7f2630c3f8d562919ec86"
         },
         {
             "name": "grafana",
@@ -78,7 +78,7 @@
                     "subdir": "Documentation/etcd-mixin"
                 }
             },
-            "version": "d6280f9ea54849e5364545ca34bdac0a58317569"
+            "version": "53891cbf9716b942b4f9c5929bbd2781180bf8e0"
         }
     ]
 }
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index f0729b5d..9762a638 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -74,10 +74,7 @@ spec:
         runAsUser: 65534
       serviceAccountName: node-exporter
       tolerations:
-      - effect: NoExecute
-        operator: Exists
-      - effect: NoSchedule
-        operator: Exists
+      - operator: Exists
       volumes:
       - hostPath:
           path: /proc