Merge pull request #20232 from mml/daemonset-warn

Auto commit by PR queue bot
2026-01-06 07:57:35 +00:00 · 2016-02-05 23:12:51 -08:00
parent 474795060c f2d5375bc0
commit 6c5540baae
6 changed files with 96 additions and 22 deletions
--- a/pkg/kubectl/cmd/drain_test.go
+++ b/pkg/kubectl/cmd/drain_test.go
@@ -323,8 +323,18 @@ func TestDrain(t *testing.T) {
 			pods:         []api.Pod{ds_pod},
 			rcs:          []api.ReplicationController{rc},
 			args:         []string{"node"},
+			expectFatal:  true,
+			expectDelete: false,
+		},
+		{
+			description:  "DS-managed pod with --ignore-daemonsets",
+			node:         node,
+			expected:     cordoned_node,
+			pods:         []api.Pod{ds_pod},
+			rcs:          []api.ReplicationController{rc},
+			args:         []string{"node", "--ignore-daemonsets"},
 			expectFatal:  false,
-			expectDelete: true,
+			expectDelete: false,
 		},
 		{
 			description:  "Job-managed pod",