Merge pull request #38617 from jszczepkowski/multizone-fix

Automatic merge from submit-queue Fixed detection of master during creation of multizone nodes cluster. ```release-note Fixed detection of master during creation of multizone nodes cluster by kube-up. ``` Fixed detection of master during creation of multizone nodes cluster by kube-up.

Merge pull request #38617 from jszczepkowski/multizone-fix
527d502b · Kubernetes Submit Queue · GitHub · 0a0294ca · b01e3c1e · 527d502b
Commit 527d502b authored Dec 13, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

util.sh cluster/gce/util.sh +1 -0

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -596,6 +596,7 @@ function kube-up() {
  set_num_migs

  if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then
+    detect-master
    parse-master-env
    create-nodes
  elif [[ ${KUBE_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then