Skip to content

N
nfs-subdir-external-provisioner
Commit 30ffcb50 by Patrick Ohly
Options

Squashed 'release-tools/' changes from 37d1104..e4dab7f

https://github.com/kubernetes-csi/csi-release-tools/commit/e4dab7f Merge https://github.com/kubernetes-csi/csi-release-tools/pull/194 from yselkowitz/registry-k8s-io https://github.com/kubernetes-csi/csi-release-tools/commit/84a4d5a Move from k8s.gcr.io to registry.k8s.io git-subtree-dir: release-tools git-subtree-split: e4dab7ff57c24cf3e8d37cd3365636fddaff7e0a
parent 72b77f08
Showing with 3 additions and 3 deletions
prow.sh
...@@ -811,7 +811,7 @@ install_snapshot_controller() { ...@@ -811,7 +811,7 @@ install_snapshot_controller() {
modified="$(cat "$i" | while IFS= read -r line; do modified="$(cat "$i" | while IFS= read -r line; do
nocomments="$(echo "$line" | sed -e 's/ *#.*$//')" nocomments="$(echo "$line" | sed -e 's/ *#.*$//')"
if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then
# Split 'image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0' # Split 'image: registry.k8s.io/sig-storage/snapshot-controller:v3.0.0'
# into image (snapshot-controller:v3.0.0), # into image (snapshot-controller:v3.0.0),
# name (snapshot-controller), # name (snapshot-controller),
# tag (v3.0.0). # tag (v3.0.0).
...@@ -912,11 +912,11 @@ patch_kubernetes () { ...@@ -912,11 +912,11 @@ patch_kubernetes () {
local source="$1" target="$2" local source="$1" target="$2"
if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
# We cannot replace k8s.gcr.io/sig-storage with gcr.io/k8s-staging-sig-storage because # We cannot replace registry.k8s.io/sig-storage with gcr.io/k8s-staging-sig-storage because
# e2e.test does not support it (see test/utils/image/manifest.go). Instead we # e2e.test does not support it (see test/utils/image/manifest.go). Instead we
# invoke the e2e.test binary with KUBE_TEST_REPO_LIST set to a file that # invoke the e2e.test binary with KUBE_TEST_REPO_LIST set to a file that
# overrides that registry. # overrides that registry.
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;' 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;'
cat >"$target/e2e-repo-list" <<EOF cat >"$target/e2e-repo-list" <<EOF
sigStorageRegistry: gcr.io/k8s-staging-sig-storage sigStorageRegistry: gcr.io/k8s-staging-sig-storage
EOF EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment