diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 9d8d1a634c5..3a3a4df648c 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -254,7 +254,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 @@ -297,7 +297,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/util.sh b/cluster/gce/util.sh index 741f41456b3..da57fde2e2a 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -531,10 +531,10 @@ 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=$(curl -L "${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/k8s-release-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" @@ -1715,7 +1715,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 589a335f015..13b916fd11b 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/release). # 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 15acb7e1a49..556be41fc39 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/hack/get-build.sh b/hack/get-build.sh index d4ed7d81677..35a19ac59ef 100755 --- a/hack/get-build.sh +++ b/hack/get-build.sh @@ -31,7 +31,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/cluster/common.sh" -declare -r KUBE_RELEASE_BUCKET_URL="https://storage.googleapis.com/kubernetes-release" +declare -r KUBE_RELEASE_BUCKET_URL="https://dl.k8s.io/" declare -r KUBE_DEV_RELEASE_BUCKET_URL="https://storage.googleapis.com/k8s-release-dev" declare -r KUBE_TAR_NAME="kubernetes.tar.gz" @@ -82,7 +82,7 @@ if [[ "${print_version}" == "true" ]]; then else echo "Using version at ${1}: ${KUBE_VERSION}" >&2 if [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then - curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/release/${KUBE_VERSION}/${KUBE_TAR_NAME}" + curl -L --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/release/${KUBE_VERSION}/${KUBE_TAR_NAME}" elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_DEV_RELEASE_BUCKET_URL}/ci/${KUBE_VERSION}/${KUBE_TAR_NAME}" else diff --git a/test/e2e/storage/external/README.md b/test/e2e/storage/external/README.md index e471a0cac5f..bb43eb15523 100644 --- a/test/e2e/storage/external/README.md +++ b/test/e2e/storage/external/README.md @@ -34,7 +34,7 @@ are added for that driver with `External Storage [Driver: ]` as prefix. To run just those tests for the example above, put that content into -`/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: +`/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: ginkgo -p -focus='External.Storage.*csi-hostpath' \ -skip='\[Feature:|\[Disruptive\]' \