Skip to content

K
k3s
Commit 1ac70eca authored by Mike Danese's avatar Mike Danese
Browse files
Options

Merge pull request #15196 from mikedanese/ds-bug

don't count nodes with 0 daemonpods running when 0 should be running as mischeduled.
parents da0ba77c d601bfa1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
pkg/controller/daemon/controller.go
View file @ 1ac70eca
...@@ -448,13 +448,18 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *experimental.DaemonSe ...@@ -448,13 +448,18 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *experimental.DaemonSe
shouldRun := nodeSelector.Matches(labels.Set(node.Labels)) shouldRun := nodeSelector.Matches(labels.Set(node.Labels))
numDaemonPods := len(nodeToDaemonPods[node.Name]) numDaemonPods := len(nodeToDaemonPods[node.Name])
if numDaemonPods > 0 { // TODO(mikedanese): this does not count nodes that should be running
// exactly one daemon pod but are running more than one daemon pods.
if shouldRun && numDaemonPods == 1 {
currentNumberScheduled++ currentNumberScheduled++
} }
if shouldRun { if shouldRun {
desiredNumberScheduled++ desiredNumberScheduled++
} else if numDaemonPods >= 0 { }
if !shouldRun && numDaemonPods > 0 {
numberMisscheduled++ numberMisscheduled++
} }
} }
......
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