Merge pull request #4958 from spiffxp/use-dl-k8s-io

🌱 Use dl.k8s.io instead of hardcoded GCS URIs

Author: k8s-ci-robot

docs/book/src/developer/providers/implementers-guide/overview.md

@@ -33,8 +33,8 @@ brew install kustomize
 
 ```bash
 # Install kubectl
-KUBECTL_VERSION=$(curl -sf https://storage.googleapis.com/kubernetes-release/release/stable.txt)
-curl -fLO https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
+KUBECTL_VERSION=$(curl -sf https://dl.k8s.io/release/stable.txt)
+curl -fLO https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
 
 # Install kustomize
 OS_TYPE=linux

hack/ensure-kubectl.sh

@@ -31,7 +31,7 @@ verify_kubectl_version() {
         mkdir -p "${GOPATH_BIN}"
       fi
       echo 'kubectl not found, installing'
-      curl -sLo "${GOPATH_BIN}/kubectl" https://storage.googleapis.com/kubernetes-release/release/${MINIMUM_KUBECTL_VERSION}/bin/linux/amd64/kubectl
+      curl -sLo "${GOPATH_BIN}/kubectl" https://dl.k8s.io/release/${MINIMUM_KUBECTL_VERSION}/bin/linux/amd64/kubectl
       chmod +x "${GOPATH_BIN}/kubectl"
     else
       echo "Missing required binary in path: kubectl"

scripts/ci-e2e-lib.sh

@@ -87,9 +87,9 @@ k8s::resolveVersion() {
   fi
 
   if [[ "$version" =~ ^ci/ ]]; then
-    resolveVersion=$(curl -LsS "http://gcsweb.k8s.io/gcs/kubernetes-release-dev/ci/${version#ci/}.txt")
+    resolveVersion=$(curl -LsS "http://dl.k8s.io/ci/${version#ci/}.txt")
   else
-    resolveVersion=$(curl -LsS "http://gcsweb.k8s.io/gcs/kubernetes-release/release/${version}.txt")
+    resolveVersion=$(curl -LsS "http://dl.k8s.io/release/${version}.txt")
   fi
   echo "+ $variableName=\"$version\" resolved to \"$resolveVersion\""
 }
@@ -216,4 +216,4 @@ kind::prepullImage () {
   else
     echo "+ image $image already present in the system, skipping pre-pull"
   fi
-}
+}

test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh.tpl

@@ -74,7 +74,7 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
   echo "* testing CI version $${KUBERNETES_VERSION}"
   # Check for semver
   if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    CI_URL="https://storage.googleapis.com/kubernetes-release/release/$${KUBERNETES_VERSION}/bin/linux/amd64"
+    CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64"
     VERSION_WITHOUT_PREFIX="$${KUBERNETES_VERSION#v}"
     export DEBIAN_FRONTEND=noninteractive
     # sometimes the network is not immediately available, so we have to retry the apt-get update
@@ -91,7 +91,7 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
       apt-get install -y "$${CI_PACKAGE}=$${PACKAGE_VERSION}"
     done
   else
-    CI_URL="https://storage.googleapis.com/k8s-release-dev/ci/$${KUBERNETES_VERSION}/bin/linux/amd64"
+    CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64"
     for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
       # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev
       # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl
@@ -103,8 +103,10 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
     systemctl restart kubelet
   fi
   for CI_CONTAINER in "$${CONTAINERS_TO_TEST[@]}"; do
-    # Browser: https://console.cloud.google.com/storage/browser/kubernetes-release?project=kubernetes-release
-    # e.g.: https://storage.googleapis.com/kubernetes-release/release/v1.20.4/bin/linux/amd64/kube-apiserver.tar
+    # Redirect: https://dl.k8s.io/release/{path}
+    # e.g. https://dl.k8s.io/release/v1.20.4/bin/linux/amd64/kube-apiserver.tar
+    # Browser: https://gcsweb.k8s.io/gcs/kubernetes-release/
+    # e.g. https://gcsweb.k8s.io/gcs/kubernetes-release/release/v1.20.4/bin/linux/amd64
     echo "* downloading package: $${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}"
     wget "$${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}" -O "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}"
     $${SUDO} ctr -n k8s.io images import "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}" || echo "* ignoring expected 'ctr images import' result"

test/framework/kubernetesversions/versions.go

@@ -27,7 +27,7 @@ import (
 
 const (
 	ciVersionURL     = "https://dl.k8s.io/ci/latest.txt"
-	stableVersionURL = "https://storage.googleapis.com/kubernetes-release/release/stable-%d.%d.txt"
+	stableVersionURL = "https://dl.k8s.io/release/stable-%d.%d.txt"
 	tagPrefix        = "v"
 )
 

test/infrastructure/docker/Dockerfile

@@ -53,7 +53,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 # Gets additional CAPD dependencies
 WORKDIR /tmp
 
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.21.2/bin/linux/amd64/kubectl && \
+RUN curl -LO https://dl.k8s.io/release/v1.21.2/bin/linux/amd64/kubectl && \
     chmod +x ./kubectl && \
     mv ./kubectl /usr/bin/kubectl