mirror of https://github.com/kubernetes/kops.git
Update references to control-plane-count
kubetest2-kops searches for create-args values of --control-plane-count. While kops recognizes both --control-plane-count and --master-count, kubetest2-kops will add --control-plane-count if it isn't already set in --create-args. This means any references to --master-count need to be updated to --control-plane-count.
This commit is contained in:
parent
bfefb0cd97
commit
71379a88dc
|
|
@ -40,7 +40,7 @@ kubetest2 kops ${KUBETEST2_COMMON_ARGS} \
|
||||||
--up --down \
|
--up --down \
|
||||||
--env S3_ENDPOINT=sfo3.digitaloceanspaces.com \
|
--env S3_ENDPOINT=sfo3.digitaloceanspaces.com \
|
||||||
--env JOB_NAME=pull-kops-e2e-kubernetes-do-kubetest2 \
|
--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 \
|
--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 \
|
--kubernetes-version=https://dl.k8s.io/release/stable-1.27.txt \
|
||||||
--test=kops \
|
--test=kops \
|
||||||
|
|
|
||||||
|
|
@ -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
|
# However, it currently fails two tests (HostPort & OIDC) so need to track that down
|
||||||
#create_args="--dns none"
|
#create_args="--dns none"
|
||||||
create_args+=("--node-size=c6g.medium")
|
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}")
|
create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c6g.2xlarge}")
|
||||||
if [[ -n "${ZONES:-}" ]]; then
|
if [[ -n "${ZONES:-}" ]]; then
|
||||||
create_args+=("--zones=${ZONES}")
|
create_args+=("--zones=${ZONES}")
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ else
|
||||||
KUBETEST2="${KUBETEST2} --build"
|
KUBETEST2="${KUBETEST2} --build"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OVERRIDES=("--channel=alpha" "--node-count=1" "--master-count=3")
|
OVERRIDES=("--channel=alpha" "--node-count=1" "--control-plane-count=3")
|
||||||
|
|
||||||
case "${CLOUD_PROVIDER}" in
|
case "${CLOUD_PROVIDER}" in
|
||||||
gce)
|
gce)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue