Merge pull request #15733 from rifelpet/cp-count

Update references to control-plane-count

tests/e2e/scenarios/digital-ocean/run-test

@@ -40,7 +40,7 @@ kubetest2 kops ${KUBETEST2_COMMON_ARGS} \
 		--up --down \
 		--env S3_ENDPOINT=sfo3.digitaloceanspaces.com \
 		--env JOB_NAME=pull-kops-e2e-kubernetes-do-kubetest2 \
-		--create-args "--networking=cilium --api-loadbalancer-type=public --node-count=2 --master-count=3" \
+		--create-args "--networking=cilium --api-loadbalancer-type=public --node-count=2 --control-plane-count=3" \
 		--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt \
 		--kubernetes-version=https://dl.k8s.io/release/stable-1.27.txt \
 		--test=kops \

tests/e2e/scenarios/scalability/run-test.sh

@@ -98,7 +98,7 @@ create_args+=("--node-count=${KUBE_NODE_COUNT:-101}")
 # However, it currently fails two tests (HostPort & OIDC) so need to track that down
 #create_args="--dns none"
 create_args+=("--node-size=c6g.medium")
-create_args+=("--master-count=${CONTROL_PLANE_COUNT:-1}")
+create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}")
 create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c6g.2xlarge}")
 if [[ -n "${ZONES:-}" ]]; then
     create_args+=("--zones=${ZONES}")

tests/e2e/scenarios/upgrade-ha-leader-migration/run-test.sh

@@ -35,7 +35,7 @@ else
 	KUBETEST2="${KUBETEST2} --build"
 fi
 
-OVERRIDES=("--channel=alpha" "--node-count=1" "--master-count=3")
+OVERRIDES=("--channel=alpha" "--node-count=1" "--control-plane-count=3")
 
 case "${CLOUD_PROVIDER}" in
 gce)