kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11994 from spiffxp/no-acls-for-you 

hack/upload: avoid ACLs for GCS buckets with UBLA enabled
This commit is contained in:
Kubernetes Prow Robot 2021-07-15 00:36:48 -07:00 committed by GitHub
parent 15c22304a3 e4ae593554
commit 48497b39db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/upload
View File

@ -26,7 +26,14 @@ if [[ "${DEST:0:5}" == "s3://" ]]; then
fi
if [[ "${DEST:0:5}" == "gs://" ]]; then
gsutil -h "Cache-Control:private,max-age=0" rsync -r ${PUBLIC:+-a public-read} ${SRC} ${DEST}
bucket=$(echo "${DEST}" | cut -d/ -f1-3)
acl_flag="${PUBLIC:+-a public-read}"
# GCS buckets with UBLA enabled error on attempts to set ACLs
# ref: https://cloud.google.com/storage/docs/uniform-bucket-level-access#enabled
if gsutil ubla get "${bucket}" | grep -q "Enabled: True" 2>/dev/null; then
acl_flag=""
fi
gsutil -h "Cache-Control:private,max-age=0" rsync -r ${acl_flag} ${SRC} ${DEST}
exit 0
fi