From 2d436f1808372f9dc22d9965ad23d7b16185c977 Mon Sep 17 00:00:00 2001 From: Grant Griffiths Date: Wed, 15 Apr 2020 19:11:33 -0700 Subject: [PATCH] Fix csi-snapshotter RBAC yaml version Signed-off-by: Grant Griffiths --- prow.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/prow.sh b/prow.sh index 86b2bf058..565269edf 100755 --- a/prow.sh +++ b/prow.sh @@ -1066,15 +1066,21 @@ main () { docker tag "$i:latest" "$i:csiprow" || die "tagging the locally built container image for $i failed" done - if [ -e deploy/kubernetes/rbac.yaml ]; then + if [ -e "deploy/kubernetes/rbac.yaml" ] || [ -e "deploy/kubernetes/csi-snapshotter/rbac-csi-snapshotter.yaml" ]; then # This is one of those components which has its own RBAC rules (like external-provisioner). # We are testing a locally built image and also want to test with the the current, # potentially modified RBAC rules. + + # snapshot-controller RBAC is handled by the cluster manager + cmds=${cmds//snapshot-controller/} if [ "$(echo "$cmds" | wc -w)" != 1 ]; then die "ambiguous deploy/kubernetes/rbac.yaml: need exactly one command, got: $cmds" fi e=$(echo "$cmds" | tr '[:lower:]' '[:upper:]' | tr - _) images="$images ${e}_RBAC=$(pwd)/deploy/kubernetes/rbac.yaml" + if [ -e "deploy/kubernetes/csi-snapshotter/rbac-csi-snapshotter.yaml" ]; then + images="$images ${e}_RBAC=$(pwd)/deploy/kubernetes/csi-snapshotter/rbac-csi-snapshotter.yaml" + fi fi fi