github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38617 from jszczepkowski/multizone-fix

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2016-12-13 02:54:32 -08:00 committed by GitHub
commit 527d502b9a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gce/util.sh
View File

@ -596,6 +596,7 @@ function kube-up() {
set_num_migs set_num_migs
if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then
detect-master
parse-master-env parse-master-env
create-nodes create-nodes
elif [[ ${KUBE_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then elif [[ ${KUBE_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then