From 99bba40682c10130f2041a9f82bbac670a9108e8 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Thu, 16 Feb 2017 15:01:52 -0500 Subject: [PATCH] Update addons yaml files. --- .../cluster-monitoring/google/heapster-controller.yaml | 4 +++- .../googleinfluxdb/heapster-controller-combined.yaml | 4 +++- .../cluster-monitoring/influxdb/heapster-controller.yaml | 5 +++-- .../cluster-monitoring/standalone/heapster-controller.yaml | 4 +++- cluster/addons/dashboard/dashboard-controller.yaml | 4 +++- .../dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml | 4 +++- cluster/addons/dns/kubedns-controller.yaml.base | 4 +++- cluster/addons/dns/kubedns-controller.yaml.in | 4 +++- cluster/addons/dns/kubedns-controller.yaml.sed | 4 +++- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 4 +++- cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 4 +++- 11 files changed, 33 insertions(+), 12 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 2a7244696d4..14f0eb67ee0 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -34,7 +34,6 @@ spec: version: v1.3.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 @@ -135,3 +134,6 @@ spec: - name: usr-ca-certs hostPath: path: "/usr/share/ca-certificates" + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index bf1deb06667..6c12dc57d34 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -34,7 +34,6 @@ spec: version: v1.3.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 @@ -136,3 +135,6 @@ spec: - name: usr-ca-certs hostPath: path: "/usr/share/ca-certificates" + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index b8d2b292cb7..1bfa3cbf1dc 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -34,7 +34,6 @@ spec: version: v1.3.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 @@ -114,4 +113,6 @@ spec: - --container=eventer - --poll-period=300000 - --estimator=exponential - + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index d94eb5cacf6..57bfb119785 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml @@ -32,7 +32,6 @@ spec: version: v1.3.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1 @@ -76,3 +75,6 @@ spec: - --container=heapster - --poll-period=300000 - --estimator=exponential + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" diff --git a/cluster/addons/dashboard/dashboard-controller.yaml b/cluster/addons/dashboard/dashboard-controller.yaml index bb21ffe9ce9..ddff4f6a534 100644 --- a/cluster/addons/dashboard/dashboard-controller.yaml +++ b/cluster/addons/dashboard/dashboard-controller.yaml @@ -17,7 +17,6 @@ spec: k8s-app: kubernetes-dashboard annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - name: kubernetes-dashboard @@ -38,3 +37,6 @@ spec: port: 9090 initialDelaySeconds: 30 timeoutSeconds: 30 + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" diff --git a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml index d437870c112..bbbfee63c4e 100644 --- a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml +++ b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml @@ -28,7 +28,6 @@ spec: k8s-app: kube-dns-autoscaler annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: containers: - name: autoscaler @@ -48,3 +47,6 @@ spec: - --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true}} - --logtostderr=true - --v=2 + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" diff --git a/cluster/addons/dns/kubedns-controller.yaml.base b/cluster/addons/dns/kubedns-controller.yaml.base index 23e5b584e63..d1f78d91701 100644 --- a/cluster/addons/dns/kubedns-controller.yaml.base +++ b/cluster/addons/dns/kubedns-controller.yaml.base @@ -44,8 +44,10 @@ spec: k8s-app: kube-dns annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" volumes: - name: kube-dns-config configMap: diff --git a/cluster/addons/dns/kubedns-controller.yaml.in b/cluster/addons/dns/kubedns-controller.yaml.in index bcf1878bba6..3ce4179fb5a 100644 --- a/cluster/addons/dns/kubedns-controller.yaml.in +++ b/cluster/addons/dns/kubedns-controller.yaml.in @@ -44,8 +44,10 @@ spec: k8s-app: kube-dns annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: + tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" volumes: - name: kube-dns-config configMap: diff --git a/cluster/addons/dns/kubedns-controller.yaml.sed b/cluster/addons/dns/kubedns-controller.yaml.sed index 2a5928a45d9..7ec373286a9 100644 --- a/cluster/addons/dns/kubedns-controller.yaml.sed +++ b/cluster/addons/dns/kubedns-controller.yaml.sed @@ -44,8 +44,10 @@ spec: k8s-app: kube-dns annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: + tolerations: + - key: "CriticalAddonsOnly" + operator": "Exists" volumes: - name: kube-dns-config configMap: diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index fb8afe95f65..50b4c1cdf4e 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -20,7 +20,6 @@ spec: # Note that this does not guarantee admission on the nodes (#40573). annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key": "node.alpha.kubernetes.io/ismaster", "effect": "NoSchedule"}]' spec: containers: - name: fluentd-es @@ -43,6 +42,9 @@ spec: readOnly: true nodeSelector: alpha.kubernetes.io/fluentd-ds-ready: "true" + tolerations: + - key : "node.alpha.kubernetes.io/ismaster" + effect: "NoSchedule" terminationGracePeriodSeconds: 30 volumes: - name: varlog diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 03a4c268a2f..1f3fe6f3555 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -21,7 +21,6 @@ spec: # Note that this does not guarantee admission on the nodes (#40573). annotations: scheduler.alpha.kubernetes.io/critical-pod: '' - scheduler.alpha.kubernetes.io/tolerations: '[{"key": "node.alpha.kubernetes.io/ismaster", "effect": "NoSchedule"}]' spec: dnsPolicy: Default containers: @@ -88,6 +87,9 @@ spec: fi; nodeSelector: alpha.kubernetes.io/fluentd-ds-ready: "true" + tolerations: + - key: "node.alpha.kubernetes.io/ismaster" + effect: "NoSchedule" terminationGracePeriodSeconds: 30 volumes: - name: varlog