Update

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>
antrea-io · Jan 16, 2024 · 1af3a7f · 1af3a7f
1 parent 62a808c
commit 1af3a7f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ci/jenkins/test-scale.sh b/ci/jenkins/test-scale.sh
@@ -291,7 +291,7 @@ function run_scale_test {
     generate_ssh_config
 
     set +e
-    ll ${WORKSPACE}
+    ls ${WORKSPACE}
     make bin
     ${WORKSPACE}/bin/antrea-scale --config ./test/performance/scale.yml
     set -e

diff --git a/test/performance/framework/scale_up.go b/test/performance/framework/scale_up.go
@@ -238,12 +238,17 @@ func ScaleUp(ctx context.Context, kubeConfigPath, scaleConfigPath string) (*Scal
 	if err != nil {
 		return nil, fmt.Errorf("error when creating kubernetes client: %w", err)
 	}
-	masterNodes, err := kClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/control-plane="})
+
+	controlPlaneNodes, err := kClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/control-plane="})
+	if err != nil {
+		return nil, fmt.Errorf("error when getting Nodes in the cluster: %w", err)
+	}
+	masterNodes, err := kClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/master="})
 	if err != nil {
 		return nil, fmt.Errorf("error when getting Nodes in the cluster: %w", err)
 	}
-	if len(masterNodes.Items) == 0 {
-		return nil, fmt.Errorf("can not find a master Node in the cluster")
+	if len(masterNodes.Items) == 0 && len(controlPlaneNodes.Items) == 0 {
+		return nil, fmt.Errorf("can not find a master/control-plane Node in the cluster")
 	}
 
 	td.kubernetesClientSet = kClient