github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37388 from yujuhong/fix_else

Browse Source 
Automatic merge from submit-queue

Fix an else branch in trusty/configure-helper.sh

Similar to #37358, for fixing #37257 on trusty.
This commit is contained in:
Kubernetes Submit Queue 2016-11-23 11:51:36 -08:00 committed by GitHub
commit de03fadccc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/trusty/configure-helper.sh
View File

@ -628,7 +628,7 @@ start_kube_apiserver() {
params="${params} --advertise-address=${vm_external_ip}"
params="${params} --ssh-user=${PROXY_SSH_USER}"
params="${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
readonly kube_apiserver_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-apiserver.docker_tag)