Merge pull request #46695 from gyliu513/daemoncontrollertest

Automatic merge from submit-queue (batch tested with PRs 46726, 41912, 46695, 46034, 46551) Added a new test case for daemoncontroller. This patch added a new test case of daemonSet with node selector, matching some nodes, and launch pods on all the nodes. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #46695 from gyliu513/daemoncontrollertest
9baeab9d · Kubernetes Submit Queue · GitHub · 24d09977 · 34024438 · 9baeab9d
Commit 9baeab9d authored Jun 02, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

daemoncontroller_test.go pkg/controller/daemon/daemoncontroller_test.go +11 -0

No files found.
--- a/pkg/controller/daemon/daemoncontroller_test.go
+++ b/pkg/controller/daemon/daemoncontroller_test.go
@@ -787,6 +787,17 @@ func TestInconsistentNameSelectorDaemonSetDoesNothing(t *testing.T) {
 	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
 }

+// DaemonSet with node selector, matching some nodes, should launch pods on all the nodes.
+func TestSelectorDaemonSetLaunchesPods(t *testing.T) {
+	ds := newDaemonSet("foo")
+	ds.Spec.Template.Spec.NodeSelector = simpleNodeLabel
+	manager, podControl, _ := newTestController(ds)
+	addNodes(manager.nodeStore, 0, 4, nil)
+	addNodes(manager.nodeStore, 4, 3, simpleNodeLabel)
+	manager.dsStore.Add(ds)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 3, 0)
+}
+
 // Daemon with node affinity should launch pods on nodes matching affinity.
 func TestNodeAffinityDaemonLaunchesPods(t *testing.T) {
 	daemon := newDaemonSet("foo")