Skip to content
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

Modified all the hardcoded GCS URIs to dl.k8s.io #1554

Closed
wants to merge 8 commits into from
Closed

Modified all the hardcoded GCS URIs to dl.k8s.io #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7126599
Modified all the hardcoded GCS URIs to dl.k8s.io
sayantani11 Jul 23, 2021
9a9273c
Replaced dl.k8s.io with gs:// where it was necessary
sayantani11 Jul 23, 2021
8ce66a1
removed the GSUTIL install and replaced the GSUTIL calls with wget
sayantani11 Jul 23, 2021
b5fb5e2
Gsutil replaced by wget
sayantani11 Jul 23, 2021
9b2d21c
Replaced the .Gsutil ls command
sayantani11 Jul 23, 2021
877b889
small error fixed in wget command
sayantani11 Jul 23, 2021
fc65ad9
Changes to commands
sayantani11 Jul 24, 2021
c70b5f1
changes to cluster-template-prow-machine-pool-ci-version.yaml
sayantani11 Jul 26, 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
12 changes: 6 additions & 6 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,9 +137,9 @@ 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"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down Expand Up @@ -311,7 +311,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 @@ -325,9 +325,9 @@ 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"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down
12 changes: 6 additions & 6 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,9 +137,9 @@ 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"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down Expand Up @@ -313,7 +313,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 @@ -327,9 +327,9 @@ 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"
sayantani11 marked this conversation as resolved.
Show resolved Hide resolved
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down
6 changes: 3 additions & 3 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,9 +58,9 @@ 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"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down
6 changes: 3 additions & 3 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,9 +56,9 @@ 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"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down
6 changes: 3 additions & 3 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,9 +54,9 @@ 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"
CI_URL="dl.k8s.io/k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
fi
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
Expand Down