Skip to content

Used dl.k8s.io instead of hardcoded GCS URIs #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Used dl.k8s.io instead of hardcoded GCS URIs #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b1e129
Update machine-pool-ci-version.yaml
jayesh-srivastava Jul 23, 2021
069a182
Update control-plane-ci-version.yaml
jayesh-srivastava Jul 23, 2021
10c4d10
Update machine-deployment-ci-version.yaml
jayesh-srivastava Jul 23, 2021
e3ffa06
Update user_project.tf
jayesh-srivastava Jul 23, 2021
55b7851
Update cluster-template-prow-ci-version.yaml
jayesh-srivastava Jul 23, 2021
98cf16e
Update cluster-template-prow-ci-version.yaml
jayesh-srivastava Jul 23, 2021
0bd94da
Update cluster-template-prow-machine-pool-ci-version.yaml
jayesh-srivastava Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/terraform-gcr-init/user_project.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions templates/test/ci/cluster-template-prow-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/test/ci/patches/control-plane-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand All @@ -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
Expand Down