From 5a441d4ad132c3924600b4a8d695dd92d1f43f64 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Tue, 6 Oct 2015 17:01:54 -0700 Subject: [PATCH] include name match in mischeduled check in daemonset controller --- pkg/controller/daemon/controller.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index b4fb9e7f2f8..c0228803d15 100644 --- a/pkg/controller/daemon/controller.go +++ b/pkg/controller/daemon/controller.go @@ -445,7 +445,10 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *experimental.DaemonSe var desiredNumberScheduled, currentNumberScheduled, numberMisscheduled int for _, node := range nodeList.Items { 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]) if numDaemonPods > 0 {