Merge pull request #45715 from gmarek/fluentd_toleration

Automatic merge from submit-queue (batch tested with PRs 45691, 45667, 45698, 45715) Add general NoExecute Toleration to fluentd in gcp configuration Ref #44445 Once merged I'll create a cherry-pick that will be picked up in GKE together with the next patch release. cc @JorritSalverda @davidopp @aveshagarwal @nimeshksingh @piosz ```release-note fluentd will tolerate all NoExecute Taints when run in gcp configuration. ```

Merge pull request #45715 from gmarek/fluentd_toleration
b58a1b56 · Kubernetes Submit Queue · GitHub · 230d2473 · 4d7d6b72 · b58a1b56
Commit b58a1b56 authored May 12, 2017 by Kubernetes Submit Queue Committed by GitHub May 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +2 -0

No files found.
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -103,6 +103,8 @@ spec:
      tolerations:
      - key: "node.alpha.kubernetes.io/ismaster"
        effect: "NoSchedule"
+      - operator: "Exists"
+        effect: "NoExecute"
      terminationGracePeriodSeconds: 30
      volumes:
      - name: varlog