jsonnet: make node_exporter pods tolerate

openshift · Jun 17, 2019 · 3b4ebe6 · 3b4ebe6
1 parent e7c369e
commit 3b4ebe6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/assets/node-exporter/daemonset.yaml b/assets/node-exporter/daemonset.yaml
@@ -66,10 +66,7 @@ spec:
       securityContext: {}
       serviceAccountName: node-exporter
       tolerations:
-      - effect: NoExecute
-        operator: Exists
-      - effect: NoSchedule
-        operator: Exists
+      - operator: Exists
       volumes:
       - hostPath:
           path: /proc

diff --git a/jsonnet/node-exporter.jsonnet b/jsonnet/node-exporter.jsonnet
@@ -95,8 +95,7 @@ local tlsVolumeName = 'node-exporter-tls';
               volumes+: [volume.fromSecret(tlsVolumeName, 'node-exporter-tls')],
               securityContext: {},
               tolerations: [
-                toleration.new() + toleration.withOperator('Exists') + toleration.withEffect('NoExecute'),
-                toleration.new() + toleration.withOperator('Exists') + toleration.withEffect('NoSchedule'),
+                { operator: "Exists" },
               ],
             },
           },

diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go