Merge pull request #69737 from qingling128/master

Add tolerations for Stackdriver Logging and Metadata Agents.
2018-10-15 05:43:41 -07:00 · 2018-10-15 05:43:41 -07:00 · 8928e70af9
parent 02cca1f11a 85d8b5069b
commit 8928e70af9
2 changed files with 10 additions and 0 deletions
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@ -101,6 +101,11 @@ spec:
      nodeSelector:
        beta.kubernetes.io/fluentd-ds-ready: "true"
      terminationGracePeriodSeconds: 60
+      tolerations:
+      - operator: "Exists"
+        effect: "NoExecute"
+      - operator: "Exists"
+        effect: "NoSchedule"
      volumes:
      - name: varlog
        hostPath:
--- a/cluster/addons/metadata-agent/stackdriver/metadata-agent.yaml
+++ b/cluster/addons/metadata-agent/stackdriver/metadata-agent.yaml
@ -58,6 +58,11 @@ spec:
      restartPolicy: Always
      schedulerName: default-scheduler
      terminationGracePeriodSeconds: 30
+      tolerations:
+      - operator: "Exists"
+        effect: "NoExecute"
+      - operator: "Exists"
+        effect: "NoSchedule"
  updateStrategy:
    rollingUpdate:
      maxUnavailable: 1