diff --git a/hack/terraform-gcr-init/user_project.tf b/hack/terraform-gcr-init/user_project.tf index e01d87a9bd8..0bed54dc366 100644 --- a/hack/terraform-gcr-init/user_project.tf +++ b/hack/terraform-gcr-init/user_project.tf @@ -42,7 +42,7 @@ resource "google_storage_bucket_acl" "acl" { ] provisioner "local-exec" { - command = "gsutil -m acl ch -r -u AllUsers:READ gs://artifacts.${google_project.project.project_id}.appspot.com" + command = "gsutil -m acl ch -r -u AllUsers:READ dl.k8s.io://artifacts.${google_project.project.project_id}.appspot.com" } depends_on = ["null_resource.gcr"] diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index c335c9a5980..0917743dd0f 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -123,7 +123,7 @@ spec: echo "* testing CI version $$CI_VERSION" # Check for semver if [[ "$${CI_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - CI_URL="gs://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - @@ -137,7 +137,7 @@ spec: DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION done else - CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64" fi diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index a5d60bbb1f2..36a2e122bb8 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -123,7 +123,7 @@ spec: echo "* testing CI version $$CI_VERSION" # Check for semver if [[ "$${CI_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - CI_URL="gs://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - @@ -137,7 +137,7 @@ spec: DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION done else - CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64" fi diff --git a/templates/test/ci/patches/control-plane-ci-version.yaml b/templates/test/ci/patches/control-plane-ci-version.yaml index 10840e0713f..ecc68f68c10 100644 --- a/templates/test/ci/patches/control-plane-ci-version.yaml +++ b/templates/test/ci/patches/control-plane-ci-version.yaml @@ -44,7 +44,7 @@ spec: echo "* testing CI version $$CI_VERSION" # Check for semver if [[ "$${CI_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - CI_URL="gs://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - @@ -58,7 +58,7 @@ spec: DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION done else - CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64" fi diff --git a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml index 52ad190d7e6..1c90b9ca747 100644 --- a/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml +++ b/templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml @@ -42,7 +42,7 @@ spec: echo "* testing CI version $$CI_VERSION" # Check for semver if [[ "$${CI_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - CI_URL="gs://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - @@ -56,7 +56,7 @@ spec: DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION done else - CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64" fi diff --git a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml index 98f788230cd..3ab6808f58e 100644 --- a/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml +++ b/templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml @@ -40,7 +40,7 @@ spec: echo "* testing CI version $$CI_VERSION" # Check for semver if [[ "$${CI_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - CI_URL="gs://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://kubernetes-release/release/$$CI_VERSION/bin/linux/amd64" VERSION_WITHOUT_PREFIX="${CI_VERSION#v}" DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https curl curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - @@ -54,7 +54,7 @@ spec: DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION done else - CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" + CI_URL="dl.k8s.io://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64" if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64" fi