github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38878 from kubernetes/revert-38780-ds-fix1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 34353, 33837, 38878)

Revert "daemonset: bail out after we enqueue once"

I get overzealous sometimes.

Reverts kubernetes/kubernetes#38780
This commit is contained in:
Kubernetes Submit Queue 2016-12-19 06:43:00 -08:00 committed by GitHub
commit 5f82fe76a2
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/daemon/daemoncontroller.go
View File

@ -385,7 +385,6 @@ func (dsc *DaemonSetsController) addNode(obj interface{}) {
shouldEnqueue := dsc.nodeShouldRunDaemonPod(node, ds)
if shouldEnqueue {
dsc.enqueueDaemonSet(ds)
return
}
}
}
@ -407,7 +406,6 @@ func (dsc *DaemonSetsController) updateNode(old, cur interface{}) {
shouldEnqueue := (dsc.nodeShouldRunDaemonPod(oldNode, ds) != dsc.nodeShouldRunDaemonPod(curNode, ds))
if shouldEnqueue {
dsc.enqueueDaemonSet(ds)
return
}
}
// TODO: it'd be nice to pass a hint with these enqueues, so that each ds would only examine the added node (unless it has other work to do, too).