Update addons yaml files.

2017-02-16 15:01:52 -05:00 · 2017-02-16 15:01:52 -05:00 · 99bba40682
parent 7f626cf836
commit 99bba40682
11 changed files with 33 additions and 12 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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:
--- 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:
--- 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:
--- 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
--- 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