github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include name match in mischeduled check in daemonset controller

Browse Source
This commit is contained in:
Mike Danese
2015-10-06 17:01:54 -07:00
parent 57a08b5563
commit 5a441d4ad1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/daemon/controller.go
View File

@@ -445,7 +445,10 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *experimental.DaemonSe
var desiredNumberScheduled, currentNumberScheduled, numberMisscheduled int var desiredNumberScheduled, currentNumberScheduled, numberMisscheduled int
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
nodeSelector := labels.Set(ds.Spec.Template.Spec.NodeSelector).AsSelector() nodeSelector := labels.Set(ds.Spec.Template.Spec.NodeSelector).AsSelector()
shouldRun := nodeSelector.Matches(labels.Set(node.Labels)) nameMatch := ds.Spec.Template.Name == "" || ds.Spec.Template.Name == node.Name
labelMatch := nodeSelector.Matches(labels.Set(node.Labels))
shouldRun := nameMatch && labelMatch
numDaemonPods := len(nodeToDaemonPods[node.Name]) numDaemonPods := len(nodeToDaemonPods[node.Name])
if numDaemonPods > 0 { if numDaemonPods > 0 {