From 715aa8b733b99f89e2fac08b9a270d5e4af0460f Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Mon, 1 Jun 2020 17:51:12 +0200 Subject: [PATCH] get-kube.sh: fix order to get the binaries from the right bucket --- cluster/get-kube.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cluster/get-kube.sh b/cluster/get-kube.sh index 6931d0e3a7d..7e50609a8c1 100755 --- a/cluster/get-kube.sh +++ b/cluster/get-kube.sh @@ -183,11 +183,16 @@ release=${KUBERNETES_RELEASE:-"release/stable"} # Translate a published version / (e.g. "release/stable") to version number. set_binary_version "${release}" if [[ -z "${KUBERNETES_SKIP_RELEASE_VALIDATION-}" ]]; then - if [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then + if [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then + # Use KUBERNETES_RELEASE_URL for Releases and Pre-Releases + # ie. 1.18.0 or 1.19.0-beta.0 + KUBERNETES_RELEASE_URL="${KUBERNETES_RELEASE_URL}" + elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then # Override KUBERNETES_RELEASE_URL to point to the CI bucket; # this will be used by get-kube-binaries.sh. + # ie. v1.19.0-beta.0.318+b618411f1edb98 KUBERNETES_RELEASE_URL="${KUBERNETES_CI_RELEASE_URL}" - elif ! [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then + else echo "Version doesn't match regexp" >&2 exit 1 fi