Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tolerate flannel running on master nodes #618

Merged
merged 1 commit into from
Mar 24, 2017

Conversation

andrewrynhard
Copy link
Contributor

DaemonSets now respect taints. This PR adds a tolerance that allows flannel to run nodes tainted with dedicated=master:NoSchedule

@philips
Copy link
Contributor

philips commented Feb 22, 2017

Where is this taint documented?

@andrewrynhard
Copy link
Contributor Author

Docs on this taint seem to be non-existant. I believe due to the fact that it is an alpha feature? I have been informed that kubernetes/kubeadm#150 should change this and move to beta.

@aveshagarwal
Copy link

Not sure which release this change targeted to, but in 1.6, tolerations are going to be api fields kubernetes/kubernetes#38957, and the pr is already merged.

@philips
Copy link
Contributor

philips commented Feb 27, 2017

@davidopp
Copy link

davidopp commented Mar 2, 2017

Moving taints and tolerations from annotations to fields was announced in these messages on kubernetes-dev

https://groups.google.com/d/msg/kubernetes-dev/-fwfHQtm9GE/H1TU4yqiBAAJ
https://groups.google.com/d/msg/kubernetes-dev/Xq7MI0CvRlc/-4sM_VKtAAAJ

(and there were identical corresponding messages on kubernetes-users).

@davidopp
Copy link

davidopp commented Mar 2, 2017

The fact that some deployment environments automatically add a taint to the master node (and therefore pods that want to run on the master node need to tolerate the taint) is outside the scope of the feature itself but I can see how it might be confusing people.

@tomdee
Copy link
Contributor

tomdee commented Mar 24, 2017

Tested on kubeadm with the 1.6 beta-4 - so merging.

@tomdee tomdee merged commit d88cd7a into flannel-io:master Mar 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants