From 9987e4635f938e0cf6c40ce52213425eb132ca55 Mon Sep 17 00:00:00 2001 From: Arnaud Meukam Date: Tue, 4 Oct 2022 22:59:51 +0200 Subject: [PATCH] Test startup: make staging bucket regional Make GCS buckets created by the e2e tests regional. There are by default multi-regional in US location. The change is introduced to minimize GCS global cost. GCS new pricing changed since Oct 1, 2022. See https://cloud.google.com/storage/pricing-announce Signed-off-by: Arnaud Meukam --- cluster/gce/util.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 3c38630f138..9431ebbf285 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -257,13 +257,13 @@ function copy-to-staging() { function set-preferred-region() { case ${ZONE} in asia-*) - PREFERRED_REGION=("asia" "us" "eu") + PREFERRED_REGION=("asia-northeast1" "us-central1" "europe-west6") ;; 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 @@ -327,7 +327,7 @@ function upload-tars() { for region in "${PREFERRED_REGION[@]}"; do suffix="-${region}" - if [[ "${suffix}" == "-us" ]]; then + if [[ "${suffix}" == "-us-central1" ]]; then suffix="" fi local staging_bucket="gs://kubernetes-staging-${project_hash}${suffix}"