From 1af3a7f7c2c0dfdee1c33e02176f3ed7fc05d335 Mon Sep 17 00:00:00 2001 From: Wenqi Qiu Date: Tue, 16 Jan 2024 10:54:38 +0800 Subject: [PATCH] Update Signed-off-by: Wenqi Qiu --- ci/jenkins/test-scale.sh | 2 +- test/performance/framework/scale_up.go | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/test-scale.sh b/ci/jenkins/test-scale.sh index cb83652ef9c..19ae8619dc0 100755 --- 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 index 26b3d97f8c0..f40dfd9a9ea 100644 --- 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