Merge pull request #10600 from rifelpet/kubetest-upgrade

Provide required --kubernetes-version flags to kubetest2-kops --up
This commit is contained in:
Kubernetes Prow Robot 2021-01-18 08:59:44 -08:00 committed by GitHub
commit 470ff01ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions

View File

@ -22,6 +22,9 @@ echo "CLOUD_PROVIDER=${CLOUD_PROVIDER}"
REPO_ROOT=$(git rev-parse --show-toplevel);
OLD_K8S_MARKER=stable-1.19.txt
NEW_K8S_MARKER=stable-1.20.txt
KUBETEST2_COMMON_ARGS="-v=2 --cloud-provider=${CLOUD_PROVIDER} --cluster-name=${CLUSTER_NAME:-} --kops-binary-path=${REPO_ROOT}/bazel-bin/cmd/kops/linux-amd64/kops"
KUBETEST2_COMMON_ARGS="${KUBETEST2_COMMON_ARGS} --admin-access=${ADMIN_ACCESS:-}"
@ -40,7 +43,9 @@ function finish {
}
trap finish EXIT
kubetest2 kops ${KUBETEST2_COMMON_ARGS} --up
kubetest2 kops ${KUBETEST2_COMMON_ARGS} \
--up \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/${OLD_K8S_MARKER}
KUBECONFIG=${HOME}/.kube/config
TEST_ARGS="--kubeconfig=${KUBECONFIG}"
@ -61,13 +66,13 @@ kubetest2 kops ${KUBETEST2_COMMON_ARGS} \
--cloud-provider=${CLOUD_PROVIDER} \
--test=kops \
-- \
--test-package-version=v1.19.4 \
--test-package-marker=${OLD_K8S_MARKER} \
--parallel 25 \
--skip-regex="\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|Services.*functioning.*NodePort" \
--test-args="${TEST_ARGS}"
kops set cluster ${CLUSTER_NAME} cluster.spec.kubernetesVersion=1.20.0
kops set cluster ${CLUSTER_NAME} cluster.spec.kubernetesVersion=https://storage.googleapis.com/kubernetes-release/release/${NEW_K8S_MARKER}
kops update cluster
kops update cluster --admin --yes