Skip to content

Commit 8580c11

Browse files
committed
fix: use dl.k8s.io, not kubernetes-release bucket
This PR updates changes related references to the legacy release bucket, excluding CHANGELOG updates. Signed-off-by: Ricky Sadowski <[email protected]>
1 parent 0265977 commit 8580c11

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

cluster/gce/gci/configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function install-gci-mounter-tools {
254254
mkdir -p "${CONTAINERIZED_MOUNTER_HOME}"
255255
chmod a+x "${CONTAINERIZED_MOUNTER_HOME}"
256256
mkdir -p "${CONTAINERIZED_MOUNTER_HOME}/rootfs"
257-
download-or-bust "${mounter_tar_sha}" "https://storage.googleapis.com/kubernetes-release/gci-mounter/mounter.tar"
257+
download-or-bust "${mounter_tar_sha}" "https://dl.k8s.io/gci-mounter/mounter.tar"
258258
cp "${KUBE_HOME}/kubernetes/server/bin/mounter" "${CONTAINERIZED_MOUNTER_HOME}/mounter"
259259
chmod a+x "${CONTAINERIZED_MOUNTER_HOME}/mounter"
260260
mv "${KUBE_HOME}/mounter.tar" /tmp/mounter.tar
@@ -297,7 +297,7 @@ function install-node-problem-detector {
297297
fi
298298

299299
echo "Downloading ${npd_tar}."
300-
local -r npd_release_path="${NODE_PROBLEM_DETECTOR_RELEASE_PATH:-https://storage.googleapis.com/kubernetes-release}"
300+
local -r npd_release_path="${NODE_PROBLEM_DETECTOR_RELEASE_PATH:-https://dl.k8s.io}"
301301
download-or-bust "${npd_hash}" "${npd_release_path}/node-problem-detector/${npd_tar}"
302302
local -r npd_dir="${KUBE_HOME}/node-problem-detector"
303303
mkdir -p "${npd_dir}"

cluster/gce/util.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,10 +531,10 @@ function tars_from_version() {
531531
find-release-tars
532532
upload-tars
533533
elif [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then
534-
SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
534+
SERVER_BINARY_TAR_URL="https://dl.k8s.io/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
535535
# TODO: Clean this up.
536536
KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}"
537-
KUBE_MANIFESTS_TAR_HASH=$(curl "${KUBE_MANIFESTS_TAR_URL}" --silent --show-error | ${sha512sum})
537+
KUBE_MANIFESTS_TAR_HASH=$(curl -L "${KUBE_MANIFESTS_TAR_URL}" --silent --show-error | ${sha512sum})
538538
KUBE_MANIFESTS_TAR_HASH=${KUBE_MANIFESTS_TAR_HASH%%[[:blank:]]*}
539539
elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
540540
SERVER_BINARY_TAR_URL="https://storage.googleapis.com/k8s-release-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
@@ -1715,7 +1715,7 @@ function setup-easyrsa {
17151715
# Note: This was heavily cribbed from make-ca-cert.sh
17161716
(set -x
17171717
cd "${KUBE_TEMP}"
1718-
curl -L -O --connect-timeout 20 --retry 6 --retry-delay 2 https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz
1718+
curl -L -O --connect-timeout 20 --retry 6 --retry-delay 2 https://dl.k8s.io/easy-rsa/easy-rsa.tar.gz
17191719
tar xzf easy-rsa.tar.gz
17201720
mkdir easy-rsa-master/kubelet
17211721
cp -r easy-rsa-master/easyrsa3/* easy-rsa-master/kubelet

cluster/get-kube-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#
4747
# Set KUBERNETES_SKIP_CONFIRM to skip the installation confirmation prompt.
4848
# Set KUBERNETES_RELEASE_URL to choose where to download binaries from.
49-
# (Defaults to https://storage.googleapis.com/kubernetes-release/release).
49+
# (Defaults to https://dl.k8s.io/release).
5050
# Set KUBERNETES_DOWNLOAD_TESTS to additionally download and extract the test
5151
# binaries tarball.
5252

cluster/get-kube.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# stable release, (e.g. 'v1.3.7').
3030
# See https://github.com/kubernetes/kubernetes/releases for release options.
3131
# Set KUBERNETES_RELEASE_URL to choose where to download binaries from.
32-
# (Defaults to https://storage.googleapis.com/kubernetes-release/release).
32+
# (Defaults to https://dl.k8s.io/release).
3333
#
3434
# Set KUBERNETES_SERVER_ARCH to choose the server (Kubernetes cluster)
3535
# architecture to download:

hack/get-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
3131

3232
source "${KUBE_ROOT}/cluster/common.sh"
3333

34-
declare -r KUBE_RELEASE_BUCKET_URL="https://storage.googleapis.com/kubernetes-release"
34+
declare -r KUBE_RELEASE_BUCKET_URL="https://dl.k8s.io/"
3535
declare -r KUBE_DEV_RELEASE_BUCKET_URL="https://storage.googleapis.com/k8s-release-dev"
3636
declare -r KUBE_TAR_NAME="kubernetes.tar.gz"
3737

@@ -82,7 +82,7 @@ if [[ "${print_version}" == "true" ]]; then
8282
else
8383
echo "Using version at ${1}: ${KUBE_VERSION}" >&2
8484
if [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then
85-
curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/release/${KUBE_VERSION}/${KUBE_TAR_NAME}"
85+
curl -L --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/release/${KUBE_VERSION}/${KUBE_TAR_NAME}"
8686
elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
8787
curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_DEV_RELEASE_BUCKET_URL}/ci/${KUBE_VERSION}/${KUBE_TAR_NAME}"
8888
else

test/e2e/storage/external/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ are added for that driver with `External Storage [Driver: <Name>]` as
3434
prefix.
3535

3636
To run just those tests for the example above, put that content into
37-
`/tmp/hostpath-testdriver.yaml`, ensure `e2e.test` is in your PATH or current directory (downloaded from a test tarball like https://storage.googleapis.com/kubernetes-release/release/v1.14.0/kubernetes-test-linux-amd64.tar.gz or built via `make WHAT=test/e2e/e2e.test`), and invoke:
37+
`/tmp/hostpath-testdriver.yaml`, ensure `e2e.test` is in your PATH or current directory (downloaded from a test tarball like https://dl.k8s.io/release/v1.14.0/kubernetes-test-linux-amd64.tar.gz or built via `make WHAT=test/e2e/e2e.test`), and invoke:
3838

3939
ginkgo -p -focus='External.Storage.*csi-hostpath' \
4040
-skip='\[Feature:|\[Disruptive\]' \

0 commit comments

Comments
 (0)