Merge pull request #35443 from ymqytw/fix_drain_flake

Automatic merge from submit-queue

Fix drain test flake

Fixes #35371

pkg/kubectl/cmd/drain.go

@@ -54,7 +54,6 @@ type DrainOptions struct {
 	nodeInfo           *resource.Info
 	out                io.Writer
 	typer              runtime.ObjectTyper
-	ifPrint            bool
 }
 
 // Takes a pod and returns a bool indicating whether or not to operate on the
@@ -198,8 +197,6 @@ func (o *DrainOptions) SetupDrain(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	o.ifPrint = true
-
 	r := o.factory.NewBuilder().
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		ResourceNames("node", args[0]).
@@ -422,9 +419,7 @@ func (o *DrainOptions) waitForDelete(pods []api.Pod, interval, timeout time.Dura
 		for i, pod := range pods {
 			p, err := getPodFn(pod.Namespace, pod.Name)
 			if apierrors.IsNotFound(err) || (p != nil && p.ObjectMeta.UID != pod.ObjectMeta.UID) {
-				if o.ifPrint {
+				cmdutil.PrintSuccess(o.mapper, false, o.out, "pod", pod.Name, false, "deleted")
-					cmdutil.PrintSuccess(o.mapper, false, o.out, "pod", pod.Name, false, "deleted")
-				}
 				continue
 			} else if err != nil {
 				return false, err

pkg/kubectl/cmd/drain_test.go

@@ -621,9 +621,11 @@ func TestDeletePods(t *testing.T) {
 		},
 	}
 
-	o := DrainOptions{}
-	o.ifPrint = false
 	for _, test := range tests {
+		f, _, _, _ := cmdtesting.NewAPIFactory()
+		o := DrainOptions{}
+		o.mapper, _ = f.Object()
+		o.out = os.Stdout
 		_, pods := createPods(false)
 		pendingPods, err := o.waitForDelete(pods, test.interval, test.timeout, test.getPodFn)