Skip to content

Commit adf2cd4

Browse files
authored
Merge pull request kubernetes#92668 from michaelmdresser/fix-kubeup-acls-mb
Fix an unnecessary failure during kube-up during bucket ACL setting and make bucket in the configured project
2 parents f7a13de + 902a4db commit adf2cd4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cluster/gce/util.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function copy-to-staging() {
241241

242242
echo "${hash}" > "${tar}.sha1"
243243
gsutil -m -q -h "Cache-Control:private, max-age=0" cp "${tar}" "${tar}.sha1" "${staging_path}"
244-
gsutil -m acl ch -g all:R "${gs_url}" "${gs_url}.sha1" >/dev/null 2>&1
244+
gsutil -m acl ch -g all:R "${gs_url}" "${gs_url}.sha1" >/dev/null 2>&1 || true
245245
echo "+++ ${basename_tar} uploaded (sha1 = ${hash})"
246246
}
247247

@@ -338,7 +338,7 @@ function upload-tars() {
338338
# Ensure the buckets are created
339339
if ! gsutil ls "${staging_bucket}" >/dev/null; then
340340
echo "Creating ${staging_bucket}"
341-
gsutil mb -l "${region}" "${staging_bucket}"
341+
gsutil mb -l "${region}" -p "${PROJECT}" "${staging_bucket}"
342342
fi
343343

344344
local staging_path="${staging_bucket}/${INSTANCE_PREFIX}-devel"

0 commit comments

Comments
 (0)