Merge pull request #57122 from caseydavenport/tolerate-taints

Automatic merge from submit-queue. 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>.

Schedule Calico components even on tainted nodes

**What this PR does / why we need it**:

Fixes https://github.com/kubernetes/kubernetes/issues/57120

**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 #

**Special notes for your reviewer**:

**Release note**:

```release-note
calico-node addon tolerates all NoExecute and NoSchedule taints by default.
```

@dnardo
This commit is contained in:
Kubernetes Submit Queue 2017-12-16 21:47:45 -08:00 committed by GitHub
commit 2124d30502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -149,5 +149,10 @@ spec:
hostPath:
path: /etc/cni/net.d
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
# Make sure calico/node gets scheduled on all nodes.
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: CriticalAddonsOnly
operator: Exists