diff --git a/tests/e2e/scenarios/lib/common.sh b/tests/e2e/scenarios/lib/common.sh index a0593bc2d3a47..6d2614d1e3b43 100644 --- a/tests/e2e/scenarios/lib/common.sh +++ b/tests/e2e/scenarios/lib/common.sh @@ -137,11 +137,17 @@ function kops-up() { create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery" fi + # TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT + if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then + echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead" + KOPS_CONTROL_PLANE_COUNT=${KOPS_CONTROL_PLANE_SIZE} + fi + ${KUBETEST2} \ --up \ --kops-binary-path="${KOPS}" \ --kubernetes-version="${K8S_VERSION}" \ --create-args="${create_args}" \ - --control-plane-size="${KOPS_CONTROL_PLANE_SIZE:-1}" \ + --control-plane-count="${KOPS_CONTROL_PLANE_COUNT:-1}" \ --template-path="${KOPS_TEMPLATE-}" } \ No newline at end of file diff --git a/tests/e2e/scenarios/upgrade-ab/run-test.sh b/tests/e2e/scenarios/upgrade-ab/run-test.sh index c4162b50c5f33..98308da17ffd1 100755 --- a/tests/e2e/scenarios/upgrade-ab/run-test.sh +++ b/tests/e2e/scenarios/upgrade-ab/run-test.sh @@ -83,11 +83,17 @@ if [[ ${KOPS_IRSA-} = true ]]; then create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery" fi +# TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT +if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then + echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead" + KOPS_CONTROL_PLANE_COUNT=${KOPS_CONTROL_PLANE_SIZE} +fi + ${KUBETEST2} \ --up \ --kops-binary-path="${KOPS_A}" \ --kubernetes-version="${K8S_VERSION_A}" \ - --control-plane-count="${KOPS_CONTROL_PLANE_SIZE:-1}" \ + --control-plane-count="${KOPS_CONTROL_PLANE_COUNT:-1}" \ --template-path="${KOPS_TEMPLATE:-}" \ --create-args="--networking calico ${KOPS_EXTRA_FLAGS:-} ${create_args}"