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

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

Merge pull request #38878 from kubernetes/revert-38780-ds-fix1
5f82fe76 · Kubernetes Submit Queue · GitHub · a366ca37 · 3a6593c9 · 5f82fe76
Commit 5f82fe76 authored Dec 19, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

daemoncontroller.go pkg/controller/daemon/daemoncontroller.go +0 -2

No files found.
--- a/pkg/controller/daemon/daemoncontroller.go
+++ b/pkg/controller/daemon/daemoncontroller.go
@@ -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).