Skip to content

Commit

Permalink
Merge pull request #67150 from grayluck/automated-cherry-pick-of-#662…
Browse files Browse the repository at this point in the history
…60-upstream-release-1.9

Automated cherry pick of #66260: Add NoSchedule and NoExecute tolerations to ip-masq-agent
  • Loading branch information
k8s-ci-robot committed Sep 10, 2018
2 parents a6e1c72 + 07c81f3 commit f3ab717
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cluster/addons/ip-masq-agent/ip-masq-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@ spec:
- key: config
path: ip-masq-agent
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: "CriticalAddonsOnly"
operator: "Exists"

0 comments on commit f3ab717

Please sign in to comment.