Merge pull request #29445 from wojtek-t/fix_kubemark_after_ip_address_machinations

Automatic merge from submit-queue

Fix Kubemark config after IP addresses machinations

cluster/kubemark/config-default.sh

@@ -23,6 +23,7 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh"
 
 GCLOUD=gcloud
 ZONE=${KUBE_GCE_ZONE:-us-central1-b}
+REGION=${ZONE%-*}
 NUM_NODES=${NUM_NODES:-100}
 MASTER_SIZE=${MASTER_SIZE:-n1-standard-$(get-master-size)}
 MASTER_DISK_TYPE=pd-ssd

test/kubemark/start-kubemark.sh

@@ -80,7 +80,6 @@ run-gcloud-compute-with-retries disks create "${MASTER_NAME}-pd" \
   --type "${MASTER_DISK_TYPE}" \
   --size "${MASTER_DISK_SIZE}"
 
-REGION=${ZONE%-*}
 run-gcloud-compute-with-retries addresses create "${MASTER_NAME}-ip" \
   --project "${PROJECT}" \
   --region "${REGION}" -q

test/kubemark/stop-kubemark.sh

@@ -32,7 +32,6 @@ gcloud compute instances delete "${MASTER_NAME}" \
 gcloud compute disks delete "${MASTER_NAME}-pd" \
     ${GCLOUD_COMMON_ARGS} || true
 
-REGION=${ZONE%-*}
 gcloud compute addresses delete "${MASTER_NAME}-ip" \
     --project "${PROJECT}" \
     --region "${REGION}" \