When UseAPIServerCacheToListPods is true, don't call kubectl's RunNodeDrain

Author: hieurender

pkg/node/node.go

@@ -114,15 +114,18 @@ func (n Node) CordonAndDrain(nodeName string, reason string, recorder recorderIn
 	if err != nil {
 		return err
 	}
-	// Delete all pods on the node
-	log.Info().Msg("Draining the node")
+	// Be very careful here: in tests, nodeName and node.Name can be different, as
+	// fetchKubernetesNode does some translation using the kubernetes.io/hostname label
 	node, err := n.fetchKubernetesNode(nodeName)
 	if err != nil {
 		return err
 	}
+	var pods *corev1.PodList
+	// Delete all pods on the node
+	log.Info().Msg("Draining the node")
 	// Emit events for all pods that will be evicted
 	if recorder != nil {
-		pods, err := n.fetchAllPods(nodeName)
+		pods, err = n.fetchAllPods(node.Name)
 		if err == nil {
 			for _, pod := range pods.Items {
 				podRef := &corev1.ObjectReference{
@@ -139,7 +142,14 @@ func (n Node) CordonAndDrain(nodeName string, reason string, recorder recorderIn
 			}
 		}
 	}
-	err = drain.RunNodeDrain(n.drainHelper, node.Name)
+	if n.nthConfig.UseAPIServerCacheToListPods {
+		if pods != nil {
+			err = n.drainHelper.DeleteOrEvictPods(pods.Items)
+		}
+	} else {
+		// RunNodeDrain does an etcd quorum-read to list all pods on this node
+		err = drain.RunNodeDrain(n.drainHelper, node.Name)
+	}
 	if err != nil {
 		return err
 	}