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

daemonset controller should respect taints #31020

Merged
merged 1 commit into from
Aug 21, 2016

Conversation

mikedanese
Copy link
Member

@mikedanese mikedanese commented Aug 19, 2016

cc @dchen1107 @davidopp

This change is Reviewable

@mikedanese mikedanese added this to the v1.4 milestone Aug 19, 2016
@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Aug 19, 2016
@mikedanese
Copy link
Member Author

If a daemon pod without a toleration is running on a node and a NoSchedule taint is added, should the daemonset controller kill that pod? Will add tests for this once we decide one way or the other.

@k8s-bot
Copy link

k8s-bot commented Aug 19, 2016

GCE e2e build/test passed for commit 00f05b4.

@davidopp
Copy link
Member

If a daemon pod without a toleration is running on a node and a NoSchedule taint is added, should the daemonset controller kill that pod?

No, that should only happen for "NoExecute" taint, which is not supported yet.

@@ -713,6 +713,16 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *api.Node, ds *exte
for _, r := range reasons {
glog.V(2).Infof("GeneralPredicates failed on pod %s for reason: %v", newPod.Name, r.GetReason())
}
if !fit {
return false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In GeneralPredicates we accumulate all the failure reasons, so if we want to do the same thing here I guess we'd drop this if statement and continue with checking PodToleratesNodeTaints regardless of whether fit is already false. But since this is only going into a log message I think it's not worth doing it that way (if it were going into events the user could see, then having the full set of failure reasons could be useful).

@davidopp
Copy link
Member

LGTM

@davidopp davidopp added lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Aug 20, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Aug 21, 2016

GCE e2e build/test passed for commit 00f05b4.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 00a474a into kubernetes:master Aug 21, 2016
@mikedanese mikedanese deleted the ds-taint branch August 21, 2016 20:40
k8s-github-robot pushed a commit that referenced this pull request Sep 2, 2016
Automatic merge from submit-queue

Revert "daemonset controller should respect taints"

Reverts #31020

We will be unreverting with some modifications after v1.4.

cc @pwittrock @davidopp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants