From bff737d3286983c728bb230bbf601b275e0f9cf4 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 21 Mar 2023 08:48:39 -0400 Subject: [PATCH] Update comments --- cluster/common.sh | 3 +-- cluster/get-kube.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cluster/common.sh b/cluster/common.sh index 1bfabccefca..d0b4702feeb 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -35,10 +35,9 @@ source "${KUBE_ROOT}/hack/lib/util.sh" export KUBE_RELEASE_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-([a-zA-Z0-9]+)\\.(0|[1-9][0-9]*))?$" export KUBE_RELEASE_VERSION_DASHED_REGEX="v(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(0|[1-9][0-9]*)(-([a-zA-Z0-9]+)-(0|[1-9][0-9]*))?" -# KUBE_CI_VERSION_REGEX matches things like "v1.2.3-alpha.4.56+abcdefg" This +# KUBE_CI_VERSION_REGEX matches things like "v1.2.3-alpha.4.56+abcdefg" and "v1.2.3-56+abcdefg" # # NOTE This must match the version_regex in build/common.sh -# kube::release::parse_and_validate_ci_version() # # TODO: KUBE_CI_VERSION_REGEX is used in hack/get-build.sh and KUBE_CI_VERSION_DASHED_REGEX is used in cluster/gce/util.sh, # make sure to remove these vars when not used anymore diff --git a/cluster/get-kube.sh b/cluster/get-kube.sh index 15342d26602..29b5dbc6f14 100755 --- a/cluster/get-kube.sh +++ b/cluster/get-kube.sh @@ -75,7 +75,7 @@ KUBE_RELEASE_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]* KUBE_CI_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)-([a-zA-Z0-9]+)\\.(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*)\\+[-0-9a-z]*)?$" # Sets KUBE_VERSION variable if an explicit version number was provided (e.g. "v1.0.6", -# "v1.2.0-alpha.1.881+376438b69c7612") or resolves the "published" version +# "v1.2.0-alpha.1.881+376438b69c7612", or "v1.2.0-881+376438b69c7612") or resolves the "published" version # / (e.g. "release/stable",' "ci/latest-1") by reading from GCS. # # See the docs on getting builds for more information about version @@ -195,7 +195,7 @@ if [[ -z "${KUBERNETES_SKIP_RELEASE_VALIDATION-}" ]]; then 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 + # ie. v1.19.0-beta.0.318+b618411f1edb98 and v1.19.0-318+b618411f1edb98 KUBERNETES_RELEASE_URL="${KUBERNETES_CI_RELEASE_URL}" else echo "Version doesn't match regexp" >&2