public_git
/
kubernetes-sigs_nfs-subdir-external-provisioner
mirror of https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #78 from ggriffiths/fix_csi_snapshotter_rbac_version_set 

Fix csi-snapshotter RBAC yaml version
This commit is contained in:
Kubernetes Prow Robot 2020-04-20 15:40:12 -07:00 committed by GitHub
parent c1bdf5bfd8 d8c76fee3e
commit 0fcc3b1bc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
prow.sh
View File

@ -1064,18 +1064,24 @@ main () {
# always pulling the image # always pulling the image
# (https://github.com/kubernetes-sigs/kind/issues/328). # (https://github.com/kubernetes-sigs/kind/issues/328).
docker tag "$i:latest" "$i:csiprow" || die "tagging the locally built container image for $i failed" docker tag "$i:latest" "$i:csiprow" || die "tagging the locally built container image for $i failed"
done
if [ -e deploy/kubernetes/rbac.yaml ]; then # For components with multiple cmds, the RBAC file should be in the following format:
# rbac-$cmd.yaml
# If this file cannot be found, we can default to the standard location:
# deploy/kubernetes/rbac.yaml
rbac_file_path=$(find . -type f -name "rbac-$i.yaml")
if [ "$rbac_file_path" == "" ]; then
rbac_file_path="$(pwd)/deploy/kubernetes/rbac.yaml"
fi
if [ -e "$rbac_file_path" ]; then
# This is one of those components which has its own RBAC rules (like external-provisioner). # 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, # We are testing a locally built image and also want to test with the the current,
# potentially modified RBAC rules. # potentially modified RBAC rules.
if [ "$(echo "$cmds" | wc -w)" != 1 ]; then e=$(echo "$i" | tr '[:lower:]' '[:upper:]' | tr - _)
die "ambiguous deploy/kubernetes/rbac.yaml: need exactly one command, got: $cmds" images="$images ${e}_RBAC=$rbac_file_path"
fi
e=$(echo "$cmds" | tr '[:lower:]' '[:upper:]' | tr - _)
images="$images ${e}_RBAC=$(pwd)/deploy/kubernetes/rbac.yaml"
fi fi
done
fi fi
if tests_need_non_alpha_cluster; then if tests_need_non_alpha_cluster; then