mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 10:51:29 +00:00
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 ```
This commit is contained in:
commit
3c05d926db
@ -52,5 +52,9 @@ spec:
|
||||
- key: config
|
||||
path: ip-masq-agent
|
||||
tolerations:
|
||||
- effect: NoSchedule
|
||||
operator: Exists
|
||||
- effect: NoExecute
|
||||
operator: Exists
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
|
Loading…
Reference in New Issue
Block a user