From 3a6593c9f19c0d1e1e8f94e75a5a116960c89ede Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 16 Dec 2016 10:18:06 -0800 Subject: [PATCH] Revert "daemonset: bail out after we enqueue once" --- pkg/controller/daemon/daemoncontroller.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 1864c774df8..ad44cb19f25 100644 --- 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).