Skip to content

Commit 92c88f2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1512 from jackfrancis/k8s-staging-ci-images
update upstream k8s CI image store reference
2 parents 36ace98 + 01b961b commit 92c88f2

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎templates/test/ci/cluster-template-prow-ci-version.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ spec:
133133
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
134134
done
135135
else
136-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
136+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
137137
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
138-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
138+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
139139
fi
140140
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
141141
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -150,7 +150,7 @@ spec:
150150
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
151151
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
152152
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
153-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
153+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
154154
done
155155
fi
156156
echo "* checking binary versions"
@@ -321,9 +321,9 @@ spec:
321321
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
322322
done
323323
else
324-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
324+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
325325
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
326-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
326+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
327327
fi
328328
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
329329
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -338,7 +338,7 @@ spec:
338338
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
339339
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
340340
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
341-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
341+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
342342
done
343343
fi
344344
echo "* checking binary versions"

‎templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ spec:
137137
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
138138
done
139139
else
140-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
140+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
141141
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
142-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
142+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
143143
fi
144144
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
145145
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -154,7 +154,7 @@ spec:
154154
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
155155
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
156156
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
157-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
157+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
158158
done
159159
fi
160160
echo "* checking binary versions"
@@ -327,9 +327,9 @@ spec:
327327
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
328328
done
329329
else
330-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
330+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
331331
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
332-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
332+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
333333
fi
334334
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
335335
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -344,7 +344,7 @@ spec:
344344
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
345345
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
346346
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
347-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
347+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
348348
done
349349
fi
350350
echo "* checking binary versions"

‎templates/test/ci/patches/control-plane-ci-version.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ spec:
5858
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
5959
done
6060
else
61-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
61+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
6262
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
63-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
63+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
6464
fi
6565
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
6666
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -75,7 +75,7 @@ spec:
7575
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
7676
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
7777
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
78-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
78+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
7979
done
8080
fi
8181
echo "* checking binary versions"

‎templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ spec:
5656
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
5757
done
5858
else
59-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
59+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
6060
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
61-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
61+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
6262
fi
6363
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
6464
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -73,7 +73,7 @@ spec:
7373
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
7474
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
7575
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
76-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
76+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
7777
done
7878
fi
7979
echo "* checking binary versions"

‎templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
5555
done
5656
else
57-
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
57+
CI_URL="gs://k8s-release-dev/ci-periodic/$$CI_VERSION/bin/linux/amd64"
5858
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
59-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
59+
CI_URL="gs://k8s-release-dev/ci/$$CI_VERSION/bin/linux/amd64"
6060
fi
6161
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
6262
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
@@ -71,7 +71,7 @@ spec:
7171
$${GSUTIL} cp "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
7272
$${SUDO} ctr -n k8s.io images import "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT" || echo "* ignoring expected 'ctr images import' result"
7373
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" k8s.gcr.io/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
74-
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/kubernetes-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
74+
$${SUDO} ctr -n k8s.io images tag k8s.gcr.io/$$CI_CONTAINER-amd64:"$${CI_VERSION//+/_}" gcr.io/k8s-staging-ci-images/$$CI_CONTAINER:"$${CI_VERSION//+/_}"
7575
done
7676
fi
7777
echo "* checking binary versions"

0 commit comments

Comments
 (0)