Skip to content

Commit 17bb169

Browse files
authored
Merge pull request #1004 from pohly/prow-update-master
master: update release-tools
2 parents 93684bb + 46f5abb commit 17bb169

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

release-tools/prow.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ install_snapshot_controller() {
811811
modified="$(cat "$i" | while IFS= read -r line; do
812812
nocomments="$(echo "$line" | sed -e 's/ *#.*$//')"
813813
if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then
814-
# Split 'image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0'
814+
# Split 'image: registry.k8s.io/sig-storage/snapshot-controller:v3.0.0'
815815
# into image (snapshot-controller:v3.0.0),
816816
# name (snapshot-controller),
817817
# tag (v3.0.0).
@@ -912,11 +912,11 @@ patch_kubernetes () {
912912
local source="$1" target="$2"
913913
914914
if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
915-
# We cannot replace k8s.gcr.io/sig-storage with gcr.io/k8s-staging-sig-storage because
915+
# We cannot replace registry.k8s.io/sig-storage with gcr.io/k8s-staging-sig-storage because
916916
# e2e.test does not support it (see test/utils/image/manifest.go). Instead we
917917
# invoke the e2e.test binary with KUBE_TEST_REPO_LIST set to a file that
918918
# overrides that registry.
919-
find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;k8s.gcr.io/sig-storage/\(.*\):v.*;k8s.gcr.io/sig-storage/\1:canary;'
919+
find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;registry.k8s.io/sig-storage/\(.*\):v.*;registry.k8s.io/sig-storage/\1:canary;'
920920
cat >"$target/e2e-repo-list" <<EOF
921921
sigStorageRegistry: gcr.io/k8s-staging-sig-storage
922922
EOF

0 commit comments

Comments
 (0)