Skip to content

K
k3s
Commit 5f82fe76 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents a366ca37 3a6593c9
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
pkg/controller/daemon/daemoncontroller.go
View file @ 5f82fe76
...@@ -385,7 +385,6 @@ func (dsc *DaemonSetsController) addNode(obj interface{}) { ...@@ -385,7 +385,6 @@ func (dsc *DaemonSetsController) addNode(obj interface{}) {
shouldEnqueue := dsc.nodeShouldRunDaemonPod(node, ds) shouldEnqueue := dsc.nodeShouldRunDaemonPod(node, ds)
if shouldEnqueue { if shouldEnqueue {
dsc.enqueueDaemonSet(ds) dsc.enqueueDaemonSet(ds)
return
} }
} }
} }
...@@ -407,7 +406,6 @@ func (dsc *DaemonSetsController) updateNode(old, cur interface{}) { ...@@ -407,7 +406,6 @@ func (dsc *DaemonSetsController) updateNode(old, cur interface{}) {
shouldEnqueue := (dsc.nodeShouldRunDaemonPod(oldNode, ds) != dsc.nodeShouldRunDaemonPod(curNode, ds)) shouldEnqueue := (dsc.nodeShouldRunDaemonPod(oldNode, ds) != dsc.nodeShouldRunDaemonPod(curNode, ds))
if shouldEnqueue { if shouldEnqueue {
dsc.enqueueDaemonSet(ds) 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). // 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).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment