Merge pull request #126 from paulfantom/node_exporter

make node_exporter pods tolerate every taint

jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet

@@ -66,14 +66,8 @@ local k = import 'ksonnet/ksonnet.beta.4/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.4/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]) +