Merge pull request #132399 from carlory/fix-132397

k8s-ci-robot · web-flow · commit 29ed1fb15274 · 2025-06-24T00:24:29.000-07:00
Fix [Failing test] [sig-node] [Feature:GPUDevicePlugin] [Serial]-related tests
diff --git a/test/e2e/node/gpu.go b/test/e2e/node/gpu.go
@@ -293,17 +293,31 @@ func SetupEnvironmentAndSkipIfNeeded(ctx context.Context, f *framework.Framework
 	}
 }
 
+func isControlPlaneNode(node v1.Node) bool {
+	_, isControlPlane := node.Labels["node-role.kubernetes.io/control-plane"]
+	if isControlPlane {
+		framework.Logf("Node: %q is a control-plane node (label)", node.Name)
+		return true
+	}
+
+	for _, taint := range node.Spec.Taints {
+		if taint.Key == "node-role.kubernetes.io/control-plane" {
+			framework.Logf("Node: %q is a control-plane node (taint)", node.Name)
+			return true
+		}
+	}
+	framework.Logf("Node: %q is NOT a control-plane node", node.Name)
+	return false
+}
+
 func areGPUsAvailableOnAllSchedulableNodes(ctx context.Context, clientSet clientset.Interface) error {
 	framework.Logf("Getting list of Nodes from API server")
 	nodeList, err := clientSet.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
 	if err != nil {
 		return fmt.Errorf("unexpected error getting node list: %w", err)
 	}
 	for _, node := range nodeList.Items {
-		if node.Spec.Unschedulable {
-			continue
-		}
-		if _, ok := node.Labels[framework.ControlPlaneLabel]; ok {
+		if node.Spec.Unschedulable || isControlPlaneNode(node) {
 			continue
 		}
 		framework.Logf("gpuResourceName %s", e2egpu.NVIDIAGPUResourceName)
