Merge pull request #37358 from roberthbailey/configure-helper

Automatic merge from submit-queue

Fix an else branch in configure-helper.sh

**What this PR does / why we need it**: bug fix for upgrade.sh needed in 1.5

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #37257
This commit is contained in:
Kubernetes Submit Queue 2016-11-23 11:51:28 -08:00 committed by GitHub
commit 1a28117bd0

View File

@ -804,7 +804,7 @@ function start-kube-apiserver {
params+=" --advertise-address=${vm_external_ip}"
params+=" --ssh-user=${PROXY_SSH_USER}"
params+=" --ssh-keyfile=/etc/srv/sshproxy/.sshkeyfile"
else [ -n "${MASTER_ADVERTISE_ADDRESS:-}" ]
elif [ -n "${MASTER_ADVERTISE_ADDRESS:-}" ]; then
params="${params} --advertise-address=${MASTER_ADVERTISE_ADDRESS}"
fi