Merge pull request #66260 from tanshanshan/fixtaint

Automatic merge from submit-queue (batch tested with PRs 66634, 66260). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. ip-masq-agent daemonset will be scheduled in all nodes. **What this PR does / why we need it**: ip-masq-agent tolerate NoSchedule and NoExecute so that it will be scheduled in all nodes. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #66255 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #66260 from tanshanshan/fixtaint
3c05d926 · Kubernetes Submit Queue · GitHub · 71b074ff · c8a4c65b · 3c05d926
Unverified Commit 3c05d926 authored Aug 07, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

ip-masq-agent.yaml cluster/addons/ip-masq-agent/ip-masq-agent.yaml +4 -0

No files found.
--- a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
+++ b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
@@ -52,5 +52,9 @@ spec:
              - key: config
                path: ip-masq-agent
      tolerations:
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
      - key: "CriticalAddonsOnly"
        operator: "Exists"