From 3b4ebe6ebbdcddaa5d9fc80f4cb026819a08460c Mon Sep 17 00:00:00 2001 From: paulfantom Date: Mon, 17 Jun 2019 14:16:47 +0200 Subject: [PATCH] jsonnet: make node_exporter pods tolerate --- assets/node-exporter/daemonset.yaml | 5 +---- jsonnet/node-exporter.jsonnet | 3 +-- pkg/manifests/bindata.go | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/assets/node-exporter/daemonset.yaml b/assets/node-exporter/daemonset.yaml index 115fb9f571..a8e0f26d77 100644 --- 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 index e0d597dade..b9b9dc74ea 100644 --- 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 index b049c2c5ef..18b7ab5203 100644 --- a/pkg/manifests/bindata.go +++ b/pkg/manifests/bindata.go @@ -814,7 +814,7 @@ func assetsNodeExporterClusterRoleYaml() (*asset, error) { return a, nil } -var _assetsNodeExporterDaemonsetYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x56\x51\x6f\xe3\x36\x0c\x7e\xef\xaf\xd0\xc3\x3d\xb4\xd8\x6c\x27\xd9\x76\xdb\x0c\xe4\xa1\x4b\x83\xf5\x80\x6b\x77\x58\x8a\xed\xed\x02\x45\xa6\x13\x21\xb2\xa9\x8a\x54\x1a\x63\xde\x7f\x1f\x14\xb7\x39\x2b\x49\xd3\x4e\x2f\x76\x28\xf2\xa3\x44\x7e\xfc\x1c\x69\xf5\x5f\xe0\x48\x63\x9d\x0b\x69\x2d\x65\x9b\xe1\x02\x58\x8e\x2e\xd6\xba\x2e\x72\x71\x23\xa1\xc2\x7a\x06\x7c\x51\x01\xcb\x42\xb2\xcc\x2f\x84\x30\x72\x01\x86\xc2\x9b\x08\x41\xb9\xa8\xb1\x80\x04\xb6\x16\x1d\x83\xbb\x10\xa2\x96\x15\x9c\xb6\x92\x95\x0a\x72\x81\x16\x6a\x5a\xe9\x92\x93\x0a\x6b\xcd\xe8\x74\xbd\xbc\x20\x0b\x2a\x80\x12\x18\x50\x8c\xae\x4b\x50\x49\x56\xab\xcf\xbd\x8c\xaf\xe4\x64\xa8\xac\x91\x0c\xcf\x51\xbd\xe3\x86\x65\x22\x80\x57\x20\x84\x78\x39\x42\x58\x0a\x6b\x96\xba\x06\xb7\x0f\x4b\x84\x74\xcb\x1e\x48\x22\x92\xe4\x09\x16\xa9\xd1\xc4\x50\x27\xb2\x28\x1c\x10\x8d\x87\xa3\x9f\xd3\x41\x3a\x48\x87\xf9\xaf\xc3\xc1\x30\xf2\xb6\x92\x57\xa9\x75\xa8\x4a\x1a\x67\x2b\x24\xce\xc2\x8f\x63\x17\x6a\x68\xef\x41\x0d\x45\x0e\x0a\x4d\x57\x9f\xb4\xd4\x06\xa8\x21\x86\x2a\xd5\xcb\x1a\x1d\x14\x49\x85\xbe\xe6\xc4\xa2\xae\x99\xc6\x5f\xb3\xcb\x02\x36\x6d\x48\xd1\x52\x43\xed\x46\xba\xcc\xe8\x45\x56\xa0\x5a\x83\xcb\xd2\xef\xae\x2e\x3f\xb4\xd9\xd5\xfb\xd1\x4b\x4a\xb8\xb1\x40\xe3\xaf\x97\xd2\x33\x96\xd4\x2e\x74\x5d\x56\x3c\xaf\x34\xa9\x56\x2d\x1d\x7a\xdb\x2a\xac\x4b\xbd\x2c\xa9\x2d\x60\xe1\xbb\xe7\xc6\xf2\xee\xc1\x95\x2d\xa9\x2d\x3d\x81\x62\xd3\xae\xfc\x12\xd8\x2c\x4a\x6a\xab\x47\x0f\x1e\x5a\xdc\x80\x33\xb2\xe9\x0e\xdc\x55\xa9\xb5\xc4\xe8\xa0\x75\x56\xcd\xad\xb6\x50\x52\x4b\xa0\xbc\xd3\xdc\x84\xd7\x50\xa6\x96\x9d\x54\x50\xd2\xd5\x87\xe8\x22\x35\xf6\xee\xf2\xa4\x4b\xbd\xdf\xd5\x95\x5c\xf6\x39\x18\x7a\x50\x01\xaf\xc0\x53\x12\x51\x22\xdf\x0c\xd2\xe1\xc7\x74\xb0\x8f\x3c\xcd\xeb\x6e\x39\x20\xf4\x4e\x01\xe5\xe2\x9f\x7f\xf7\xd6\x0d\x1a\x5f\xc1\x5d\xe8\x4a\x44\x9c\x5d\x9f\xbe\x48\x5e\xe5\xe2\x04\x0f\x5e\x32\x1d\x18\x1d\xc8\xe2\x8f\xda\x34\xb9\x28\xa5\x21\x38\x07\xd7\x27\xcd\x0b\x5a\x6c\xfb\x1f\x60\x0e\x91\x7b\x91\xdd\xbe\x43\x2b\x97\x92\x77\xca\x71\x8b\xc4\x0f\x38\x79\x19\x98\xa3\xcc\x07\x00\xdf\x52\xb3\xf3\x70\x66\xb8\x76\xad\x86\xe4\x60\xbe\xc2\x58\x0d\x22\x3f\x6f\x89\x1d\xc8\x6a\xbc\x62\xb6\x79\x96\xc5\x13\x98\x45\xbe\x6c\x28\x51\xe0\x38\x09\xfc\x1e\x67\xc0\x2a\x63\x43\x99\x75\x7a\x23\x19\xc2\x7b\xaa\x1c\x1f\x85\x3c\xef\x27\x6b\x68\xce\x44\xae\xa1\x39\x4e\xa6\xed\x0a\x5c\x42\x5e\x33\xd0\xf8\xe1\xf3\x6c\x3e\x9d\xdc\xdc\x4e\xe7\x7f\xce\xae\xe7\x7f\x7f\x7a\xb8\x9d\x5f\x4f\x67\xf3\xe1\xe8\x97\xf9\xef\x93\xbb\xf9\xec\xf6\x7a\xf4\xd3\xc7\xef\xbf\x79\x4d\x27\x37\x6f\xf8\x1d\xe1\x4c\x7e\x9b\xbc\x0b\xe7\xa4\xdf\x19\xb4\xc3\x01\x7a\xf4\xb2\x49\x35\x66\x0a\x1d\x20\x65\x6b\xbf\x80\xc4\x2d\xa4\x4a\xac\xc3\x6d\x13\x86\xe7\x87\x74\x78\x30\x3b\x07\x4e\xfb\xdd\x30\x4c\x51\xf3\xf7\xea\xfb\x05\x1d\xe7\x22\x6a\xb9\x10\x81\x96\x27\x37\xba\x2c\x81\x06\x74\x62\x32\x7b\x8e\x46\x57\x9a\x23\x8b\x10\xca\xfa\x5c\x8c\x06\x55\x64\xac\xa0\x42\xd7\xe4\xe2\xc7\xc1\x9d\x8e\x38\xfc\xe8\x81\x4e\x22\x0c\x5f\x41\x18\xf5\x11\xde\x23\x0c\x07\x0c\x3b\xba\x66\x24\x44\x81\x6b\x6f\x8e\x77\xa8\xdb\x3d\xf0\x13\xba\x75\x34\x7c\xbb\x7a\x7e\xba\x89\x6c\x01\x7d\x16\x7d\x8a\xc3\x0a\xff\x0e\xd2\xd0\x45\x57\x03\x03\x85\xfe\x23\xe5\xc2\xe8\xda\x6f\x9f\x9d\x5e\x04\x3a\xe8\x01\x6c\xb9\xa7\x87\x04\x6e\xa3\x15\x5c\x2b\x15\x6e\x79\xff\xaa\x9a\x32\x1a\x70\x3b\x6d\xe9\x7d\x7b\xa1\x2c\x41\x71\x2e\xee\x71\xba\x05\xe5\x7b\xf5\x40\x1b\xbc\xd1\xe5\x62\xba\xd5\xc4\x74\x22\x64\xa6\x56\x50\x78\xf3\x66\x4c\xd7\x96\x5e\xd6\x5d\x65\x42\x3b\x7a\xb5\xb5\x5d\x7b\x22\x75\x3e\x12\xec\xb3\xa1\x7d\x29\x3e\x14\xe7\xb3\x81\x07\x51\x3d\x61\x4d\xde\x24\x05\x81\x72\xc0\x7d\xd0\xce\x72\xa2\x0f\xbb\xb8\xff\x02\x00\x00\xff\xff\xcf\x37\xdf\xb8\x1c\x0a\x00\x00") +var _assetsNodeExporterDaemonsetYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x56\x4d\x6f\xe3\x36\x10\xbd\xe7\x57\xf0\xb0\x87\x0d\x5a\x49\xb6\xdb\x6e\x5b\x01\x3e\xa4\x4e\xd0\x2c\xb0\xd9\x2e\xea\xa0\xbd\xad\x41\xd3\x23\x9b\xb0\xa4\x61\x66\x86\x4e\x84\xaa\xff\xbd\xa0\x15\x7b\x45\xdb\x71\x52\x5e\x24\x0f\xdf\xbc\x21\xe7\xe3\xc9\xda\xd9\xbf\x80\xd8\x62\x9d\x2b\xed\x1c\x67\x9b\xe1\x1c\x44\x8f\x2e\xd6\xb6\x5e\xe4\xea\x5a\x43\x85\xf5\x14\xe4\xa2\x02\xd1\x0b\x2d\x3a\xbf\x50\xaa\xd4\x73\x28\x39\xbc\xa9\xe0\x94\xab\x1a\x17\x90\xc0\x93\x43\x12\xa0\x0b\xa5\x6a\x5d\xc1\x69\x2b\x3b\x6d\x20\x57\xe8\xa0\xe6\x95\x2d\x24\xa9\xb0\xb6\x82\x64\xeb\xe5\x05\x3b\x30\x81\x94\xa1\x04\x23\x48\x5d\x80\x4a\x8b\x59\x7d\xea\x45\x7c\x21\xa6\x40\xe5\x4a\x2d\xf0\xec\xd5\x3b\x6e\x58\x65\x44\xf0\x02\x85\x52\xbb\x23\x84\x65\xb0\x16\x6d\x6b\xa0\xbd\x5b\xa2\x34\x2d\x7b\x24\x89\x4a\x92\x47\x98\xa7\xa5\x65\x81\x3a\xd1\x8b\x05\x01\xf3\x78\x38\xfa\x39\x1d\xa4\x83\x74\x98\xff\x3a\x1c\x0c\x23\xb4\xd3\xb2\x4a\x1d\xa1\x29\x78\x9c\xad\x90\x25\x0b\x3f\x8e\x21\xdc\xf0\x1e\xc1\x0d\x47\x00\x83\x65\x97\x9f\xb4\xb0\x25\x70\xc3\x02\x55\x6a\x97\x35\x12\x2c\x92\x0a\x7d\x2d\x89\x43\x5b\x0b\x8f\xbf\x66\xef\x17\xb0\x69\x43\x88\x96\x1b\x6e\x37\x9a\xb2\xd2\xce\xb3\x05\x9a\x35\x50\x96\x7e\x77\xf9\xfe\x5d\x9b\x5d\xbe\x9d\xbd\xe0\x44\x1a\x07\x3c\xfe\xfa\x5e\x7b\xc1\x82\xdb\xb9\xad\x8b\x4a\x66\x95\x65\xd3\x9a\x25\xa1\x77\xad\xc1\xba\xb0\xcb\x82\xdb\x05\xcc\x7d\xf7\xdc\x38\xd9\x3e\xa4\x72\x05\xb7\x85\x67\x30\x52\xb6\x2b\xbf\x04\x29\xe7\x05\xb7\xd5\x83\x07\x0f\x2d\x6e\x80\x4a\xdd\x74\x07\xee\xb2\xd4\x3a\x16\x24\x68\xc9\x99\x99\xb3\x0e\x0a\x6e\x19\x8c\x27\x2b\x4d\x78\x0d\x69\x6a\x85\xb4\x81\x82\x2f\xdf\x45\x17\xa9\xb1\x77\x97\x47\x5b\xd8\xfd\xae\xad\xf4\xb2\xdf\x83\xa1\x06\x15\xc8\x0a\x3c\x27\x51\x4b\xe4\x9b\x41\x3a\xfc\x90\x0e\xf6\x9e\xa7\xfb\xba\x5b\x04\x8c\x9e\x0c\x70\xae\xfe\xf9\x77\x6f\xdd\x60\xe9\x2b\xb8\x0b\x55\x89\x1a\x67\x5b\xa7\x2f\x5a\x56\xb9\x3a\xd1\x07\xbb\x48\x07\x46\x02\xbd\xf8\xa3\x2e\x9b\x5c\x15\xba\x64\x38\x47\xd7\x6f\x9a\x1d\x5b\x6c\xfb\x1f\x64\x84\x28\x3d\xcf\x6e\x9f\xd0\xe9\xa5\x96\xad\x72\xdc\x22\xcb\x3d\x4e\x76\x03\x73\x14\xf9\x80\xe0\x5b\x68\x21\x0f\x67\x86\x6b\x5b\x6a\x48\x0e\xe6\x2b\x8c\xd5\x20\xc2\x79\xc7\x42\xa0\xab\xf1\x4a\xc4\xe5\x59\x16\x4f\x60\x16\x61\xa5\xe4\xc4\x00\x49\x12\xfa\x7b\x9c\x81\x98\x4c\x4a\xce\x1c\xd9\x8d\x16\x08\xef\xa9\x21\x39\x72\x79\xde\x4f\xd6\xd0\x9c\xf1\x5c\x43\x73\x1c\xcc\xba\x15\x50\xc2\xde\x0a\xf0\xf8\xfe\xd3\x74\x76\x33\xb9\xbe\xbd\x99\xfd\x39\xbd\x9a\xfd\xfd\xf1\xfe\x76\x76\x75\x33\x9d\x0d\x47\xbf\xcc\x7e\x9f\xdc\xcd\xa6\xb7\x57\xa3\x9f\x3e\x7c\xff\x0d\x75\x33\xb9\x7e\x05\x77\xc4\x33\xf9\x6d\xf2\x26\x9e\x93\xb8\x33\x6c\x87\x03\xf4\xe0\x75\x93\x5a\xcc\x0c\x12\x20\x67\x6b\x3f\x87\x84\xe6\xda\x24\x8e\xf0\xa9\x09\xc3\xf3\x43\x3a\x3c\x98\x9d\x03\xd0\x7e\x37\x0c\x53\x54\xfc\xbd\xfa\x7e\x41\x92\x5c\x45\x25\x57\x2a\xb4\xe5\xc9\x8d\x2e\x4a\x68\x03\x3e\x31\x99\x3d\x60\x69\x2b\x2b\x91\x45\x29\xe3\x7c\xae\x46\x83\x2a\x32\x56\x50\x21\x35\xb9\xfa\x71\x70\x67\xa3\x1e\x7e\xf0\xc0\x27\x19\x86\x2f\x30\x8c\xfa\x0c\x6f\x11\x86\x83\x0e\x3b\xba\x66\x24\x44\xa1\xd7\x5e\x1d\xef\x90\xb7\xcf\x20\x8f\x48\xeb\x68\xf8\xb6\xf9\xfc\x78\x1d\xd9\x02\xfb\x34\xfa\x14\x87\x15\xfe\x1d\xa4\xa1\x8a\x54\x83\x00\x87\xfa\x23\xe7\xaa\xb4\xb5\x7f\x7a\x06\xed\x04\x3a\xe8\x01\x3c\x49\x4f\x0f\x19\x68\x63\x0d\x5c\x19\x13\x6e\xf9\xf9\x45\x35\x15\x2c\x81\xb6\xda\xd2\xfb\xf6\xa2\x0b\x36\xa4\x5c\xdd\x3c\x59\x96\xdd\x65\xbb\x44\xf6\x70\xdb\xbb\x84\x04\xf6\xb2\xe1\xba\x84\x46\x7a\x7a\x24\xb1\x67\x5d\xfb\xe2\x79\x28\xa7\x67\x1d\x0f\xbc\x7a\x52\x98\xbc\x5a\x46\x06\x43\x20\x7d\xd2\xce\x72\x22\x73\x5b\xbf\xff\x02\x00\x00\xff\xff\xe1\xe0\x8a\x5c\xce\x09\x00\x00") func assetsNodeExporterDaemonsetYamlBytes() ([]byte, error) { return bindataRead( @@ -829,7 +829,7 @@ func assetsNodeExporterDaemonsetYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/node-exporter/daemonset.yaml", size: 2588, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/node-exporter/daemonset.yaml", size: 2510, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil }