Automated cherry pick of #16478 upstream release 1.1

pkg/api/resource_helpers.go

@@ -87,3 +87,13 @@ func GetPodReadyCondition(status PodStatus) *PodCondition {
 	}
 	return nil
 }
+
+// IsNodeReady returns true if a node is ready; false otherwise.
+func IsNodeReady(node *Node) bool {
+	for _, c := range node.Status.Conditions {
+		if c.Type == NodeReady {
+			return c.Status == ConditionTrue
+		}
+	}
+	return false
+}

pkg/controller/daemon/controller.go

@@ -348,13 +348,18 @@ func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet) {
 		glog.Errorf("Couldn't get list of nodes when syncing daemon set %+v: %v", ds, err)
 	}
 	var nodesNeedingDaemonPods, podsToDelete []string
-	for i := range nodeList.Items {
+	for i, node := range nodeList.Items {
 		// Check if the node satisfies the daemon set's node selector.
 		nodeSelector := labels.Set(ds.Spec.Template.Spec.NodeSelector).AsSelector()
 		shouldRun := nodeSelector.Matches(labels.Set(nodeList.Items[i].Labels))
 		// If the daemon set specifies a node name, check that it matches with nodeName.
 		nodeName := nodeList.Items[i].Name
 		shouldRun = shouldRun && (ds.Spec.Template.Spec.NodeName == "" || ds.Spec.Template.Spec.NodeName == nodeName)
+
+		// If the node is not ready, don't run on it.
+		// TODO(mikedanese): remove this once daemonpods forgive nodes
+		shouldRun = shouldRun && api.IsNodeReady(&node)
+
 		daemonPods, isRunning := nodeToDaemonPods[nodeName]
 		if shouldRun && !isRunning {
 			// If daemon pod is supposed to be running on node, but isn't, create daemon pod.

pkg/controller/daemon/controller_test.go

@@ -88,6 +88,11 @@ func newNode(name string, label map[string]string) *api.Node {
 			Labels:    label,
 			Namespace: api.NamespaceDefault,
 		},
+		Status: api.NodeStatus{
+			Conditions: []api.NodeCondition{
+				{Type: api.NodeReady, Status: api.ConditionTrue},
+			},
+		},
 	}
 }
 
@@ -181,6 +186,21 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
 	syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
 }
 
+// DaemonSets should not place onto NotReady nodes
+func TestNotReadNodeDaemonDoesNotLaunchPod(t *testing.T) {
+	manager, podControl := newTestController()
+	node := newNode("not-ready", nil)
+	node.Status = api.NodeStatus{
+		Conditions: []api.NodeCondition{
+			{Type: api.NodeReady, Status: api.ConditionFalse},
+		},
+	}
+	manager.nodeStore.Add(node)
+	ds := newDaemonSet("foo")
+	manager.dsStore.Add(ds)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
+}
+
 // Controller should not create pods on nodes which have daemon pods, and should remove excess pods from nodes that have extra pods.
 func TestDealsWithExistingPods(t *testing.T) {
 	manager, podControl := newTestController()