diff --git a/cluster/gce/gci/master-helper.sh b/cluster/gce/gci/master-helper.sh index 593652c9e07..d6c48add00a 100755 --- a/cluster/gce/gci/master-helper.sh +++ b/cluster/gce/gci/master-helper.sh @@ -68,6 +68,7 @@ function replicate-master-instance() { get-metadata "${existing_master_zone}" "${existing_master_name}" gci-ensure-gke-docker > "${KUBE_TEMP}/gci-ensure-gke-docker.txt" get-metadata "${existing_master_zone}" "${existing_master_name}" gci-docker-version > "${KUBE_TEMP}/gci-docker-version.txt" get-metadata "${existing_master_zone}" "${existing_master_name}" kube-master-certs > "${KUBE_TEMP}/kube-master-certs.yaml" + get-metadata "${existing_master_zone}" "${existing_master_name}" cluster-location > "${KUBE_TEMP}/cluster-location.txt" create-master-instance-internal "${REPLICA_NAME}" } @@ -114,6 +115,7 @@ function create-master-instance-internal() { metadata="${metadata},gci-ensure-gke-docker=${KUBE_TEMP}/gci-ensure-gke-docker.txt" metadata="${metadata},gci-docker-version=${KUBE_TEMP}/gci-docker-version.txt" metadata="${metadata},kube-master-certs=${KUBE_TEMP}/kube-master-certs.yaml" + metadata="${metadata},cluster-location=${KUBE_TEMP}/cluster-location.txt" metadata="${metadata},${MASTER_EXTRA_METADATA}" local disk="name=${master_name}-pd" diff --git a/test/e2e/lifecycle/ha_master.go b/test/e2e/lifecycle/ha_master.go index a9912d5f874..de58b26e8ee 100644 --- a/test/e2e/lifecycle/ha_master.go +++ b/test/e2e/lifecycle/ha_master.go @@ -78,7 +78,7 @@ func createNewRC(c clientset.Interface, ns string, name string) { } func findRegionForZone(zone string) string { - region, err := exec.Command("gcloud", "compute", "zones", "list", zone, "--quiet", "--format=csv[no-heading](region)").CombinedOutput() + region, err := exec.Command("gcloud", "compute", "zones", "list", zone, "--quiet", "--format=csv[no-heading](region)").Output() framework.ExpectNoError(err) if string(region) == "" { framework.Failf("Region not found; zone: %s", zone) @@ -88,7 +88,7 @@ func findRegionForZone(zone string) string { func findZonesForRegion(region string) []string { output, err := exec.Command("gcloud", "compute", "zones", "list", "--filter=region="+region, - "--quiet", "--format=csv[no-heading](name)").CombinedOutput() + "--quiet", "--format=csv[no-heading](name)").Output() framework.ExpectNoError(err) zones := strings.Split(string(output), "\n") return zones