From cf2335c67c143517d6c22ab7781360e59c002341 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Mon, 19 Jul 2021 07:28:22 -0700 Subject: [PATCH] use dl.k8s.io where possible The only time a kubernetes GCS bucket name should be showing up in a hardcoded URI is if gsutil is being used (e.g. gsutil cp gs://foo/bar .) Otherwise, for tools like curl or wget, dl.k8s.io is much nicer for us as a project, since we can transparently change where that redirects to without having to change code everywhere These changes will mean very few changes will be necessary to accommodate a gs://kubernetes-release -> gs://k8s-release migration equivalent of the CI migration we're going through right now These changes also address the gs://kubernetes-release-dev references currently used by this repo (ref: https://github.com/kubernetes/k8s.io/issues/2318) --- cluster/common.sh | 6 +----- cluster/gce/gci/configure-helper.sh | 2 +- cluster/gce/gci/configure.sh | 4 ++-- cluster/gce/upgrade.sh | 6 +++--- cluster/gce/util.sh | 6 +++--- cluster/get-kube-binaries.sh | 2 +- cluster/get-kube.sh | 2 +- defs/repo_rules.bzl | 4 ++-- 8 files changed, 14 insertions(+), 18 deletions(-) diff --git a/cluster/common.sh b/cluster/common.sh index 8e02abed7c..06d189154b 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -289,11 +289,7 @@ function load-or-gen-kube-basicauth() { function set_binary_version() { if [[ "${1}" =~ "/" ]]; then IFS='/' read -r -a path <<< "${1}" - if [[ "${path[0]}" == "release" ]]; then - KUBE_VERSION=$(gsutil cat "gs://kubernetes-release/${1}.txt") - else - KUBE_VERSION=$(gsutil cat "gs://kubernetes-release-dev/${1}.txt") - fi + KUBE_VERSION=$(curl -Ls "https://dl.k8s.io/${1}.txt") else KUBE_VERSION=${1} fi diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 2eb7ba4a9d..9101b48c2a 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3018,7 +3018,7 @@ You can find documentation for Kubernetes at: The source for this release can be found at: /home/kubernetes/kubernetes-src.tar.gz Or you can download it at: - https://storage.googleapis.com/kubernetes-release/release/${version}/kubernetes-src.tar.gz + https://dl.k8s.io/release/${version}/kubernetes-src.tar.gz It is based on the Kubernetes source at: https://github.com/kubernetes/kubernetes/tree/${gitref} diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index f2bfae9615..ba547c01c9 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -245,7 +245,7 @@ function install-gci-mounter-tools { mkdir -p "${CONTAINERIZED_MOUNTER_HOME}" chmod a+x "${CONTAINERIZED_MOUNTER_HOME}" mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs" - download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar" + download-or-bust "${mounter_tar_sha}" "https://dl.k8s.io/gci-mounter/mounter.tar" cp "${KUBE_HOME}/kubernetes/server/bin/mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter" chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter" mv "${KUBE_HOME}/mounter.tar" /tmp/mounter.tar @@ -271,7 +271,7 @@ function install-node-problem-detector { fi echo "Downloading ${npd_tar}." - local -r npd_release_path="${NODE_PROBLEM_DETECTOR_RELEASE_PATH:-https://storage.googleapis.com/kubernetes-release}" + local -r npd_release_path="${NODE_PROBLEM_DETECTOR_RELEASE_PATH:-https://dl.k8s.io}" download-or-bust "${npd_hash}" "${npd_release_path}/node-problem-detector/${npd_tar}" local -r npd_dir="${KUBE_HOME}/node-problem-detector" mkdir -p "${npd_dir}" diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh index dbe4baec8a..f06b16771a 100755 --- a/cluster/gce/upgrade.sh +++ b/cluster/gce/upgrade.sh @@ -61,9 +61,9 @@ function usage() { local release_latest local ci_latest - release_stable=$(gsutil cat gs://kubernetes-release/release/stable.txt) - release_latest=$(gsutil cat gs://kubernetes-release/release/latest.txt) - ci_latest=$(gsutil cat gs://kubernetes-release-dev/ci/latest.txt) + release_stable=$(curl -Ls https://dl.k8s.io/release/stable.txt) + release_latest=$(curl -Ls https://dl.k8s.io/release/latest.txt) + ci_latest=$(curl -Ls https://dl.k8s.io/ci/latest.txt) echo "Right now, versions are as follows:" echo " release/stable: ${0} ${release_stable}" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 72749b5864..8ae3c59974 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -526,13 +526,13 @@ function tars_from_version() { find-release-tars upload-tars elif [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then - SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" + SERVER_BINARY_TAR_URL="https://dl.k8s.io/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" # TODO: Clean this up. KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" KUBE_MANIFESTS_TAR_HASH=$(curl "${KUBE_MANIFESTS_TAR_URL}" --silent --show-error | ${sha512sum}) KUBE_MANIFESTS_TAR_HASH=${KUBE_MANIFESTS_TAR_HASH%%[[:blank:]]*} elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then - SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" + SERVER_BINARY_TAR_URL="https://dl.k8s.io-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" # TODO: Clean this up. KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" KUBE_MANIFESTS_TAR_HASH=$(curl "${KUBE_MANIFESTS_TAR_URL}" --silent --show-error | ${sha512sum}) @@ -1699,7 +1699,7 @@ function setup-easyrsa { # Note: This was heavily cribbed from make-ca-cert.sh (set -x cd "${KUBE_TEMP}" - curl -L -O --connect-timeout 20 --retry 6 --retry-delay 2 https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz + curl -L -O --connect-timeout 20 --retry 6 --retry-delay 2 https://dl.k8s.io/easy-rsa/easy-rsa.tar.gz tar xzf easy-rsa.tar.gz mkdir easy-rsa-master/kubelet cp -r easy-rsa-master/easyrsa3/* easy-rsa-master/kubelet diff --git a/cluster/get-kube-binaries.sh b/cluster/get-kube-binaries.sh index dc9d29a653..a60d4dd61d 100755 --- a/cluster/get-kube-binaries.sh +++ b/cluster/get-kube-binaries.sh @@ -46,7 +46,7 @@ # # Set KUBERNETES_SKIP_CONFIRM to skip the installation confirmation prompt. # Set KUBERNETES_RELEASE_URL to choose where to download binaries from. -# (Defaults to https://storage.googleapis.com/kubernetes-release/release). +# (Defaults to https://dl.k8s.io). # Set KUBERNETES_DOWNLOAD_TESTS to additionally download and extract the test # binaries tarball. diff --git a/cluster/get-kube.sh b/cluster/get-kube.sh index f6a3419885..e99726a8e3 100755 --- a/cluster/get-kube.sh +++ b/cluster/get-kube.sh @@ -29,7 +29,7 @@ # stable release, (e.g. 'v1.3.7'). # See https://github.com/kubernetes/kubernetes/releases for release options. # Set KUBERNETES_RELEASE_URL to choose where to download binaries from. -# (Defaults to https://storage.googleapis.com/kubernetes-release/release). +# (Defaults to https://dl.k8s.io/release). # # Set KUBERNETES_SERVER_ARCH to choose the server (Kubernetes cluster) # architecture to download: diff --git a/defs/repo_rules.bzl b/defs/repo_rules.bzl index 74ac09d9ed..8c12b7c215 100644 --- a/defs/repo_rules.bzl +++ b/defs/repo_rules.bzl @@ -14,7 +14,7 @@ pkg_tar( """ def _archive_url(folder, version, archive): - return paths.join("https://storage.googleapis.com", folder, version, archive) + return paths.join("https://dl.k8s.io", folder, version, archive) def _fetch_kube_release(ctx): build_file_contents = BUILD_PRELUDE @@ -33,7 +33,7 @@ def _fetch_kube_release(ctx): fetch_kube_release = repository_rule( implementation = _fetch_kube_release, attrs = { - "folder": attr.string(default = "kubernetes-release/release"), + "folder": attr.string(default = "release"), "version": attr.string(mandatory = True), "archives": attr.string_dict(mandatory = True), },