Merge pull request #112872 from ameukam/regional-bucket

Test startup: make staging bucket regional
This commit is contained in:
Kubernetes Prow Robot 2022-10-05 11:35:46 -07:00 committed by GitHub
commit 4511da23c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -257,13 +257,13 @@ function copy-to-staging() {
function set-preferred-region() { function set-preferred-region() {
case ${ZONE} in case ${ZONE} in
asia-*) asia-*)
PREFERRED_REGION=("asia" "us" "eu") PREFERRED_REGION=("asia-northeast1" "us-central1" "europe-west6")
;; ;;
europe-*) europe-*)
PREFERRED_REGION=("eu" "us" "asia") PREFERRED_REGION=("europe-west6" "us-central1" "asia-northeast1")
;; ;;
*) *)
PREFERRED_REGION=("us" "eu" "asia") PREFERRED_REGION=("us-central1" "europe-west6" "asia-northeast1")
;; ;;
esac esac
@ -327,7 +327,7 @@ function upload-tars() {
for region in "${PREFERRED_REGION[@]}"; do for region in "${PREFERRED_REGION[@]}"; do
suffix="-${region}" suffix="-${region}"
if [[ "${suffix}" == "-us" ]]; then if [[ "${suffix}" == "-us-central1" ]]; then
suffix="" suffix=""
fi fi
local staging_bucket="gs://kubernetes-staging-${project_hash}${suffix}" local staging_bucket="gs://kubernetes-staging-${project_hash}${suffix}"