Merge pull request #212 from pohly/prow-update-master
master: update release-tools
This commit is contained in:
		
						commit
						0bd4e87b34
					
				|  | @ -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 () { | ||||||
|     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 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue