Merge pull request #21010 from mikedanese/ds-revert

pkg/controller/daemon/controller.go

@@ -582,11 +582,6 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *api.Node, ds *exte
 	if !(ds.Spec.Template.Spec.NodeName == "" || ds.Spec.Template.Spec.NodeName == node.Name) {
 		return false
 	}
-	// If the node is not ready, don't run on it.
-	// TODO(mikedanese): remove this once daemonpods forgive nodes
-	if !api.IsNodeReady(node) {
-		return false
-	}
 
 	for _, c := range node.Status.Conditions {
 		if c.Type == api.NodeOutOfDisk && c.Status == api.ConditionTrue {

pkg/controller/daemon/controller_test.go

@@ -184,7 +184,7 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
 	syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
 }
 
-// DaemonSets should not place onto NotReady nodes
+// DaemonSets should place onto NotReady nodes
 func TestNotReadNodeDaemonDoesNotLaunchPod(t *testing.T) {
 	manager, podControl := newTestController()
 	node := newNode("not-ready", nil)
@@ -196,7 +196,7 @@ func TestNotReadNodeDaemonDoesNotLaunchPod(t *testing.T) {
 	manager.nodeStore.Add(node)
 	ds := newDaemonSet("foo")
 	manager.dsStore.Add(ds)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
 }
 
 // DaemonSets should not place onto OutOfDisk nodes