Skip to content

K
k3s
Commit de03fadc authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #37388 from yujuhong/fix_else

Automatic merge from submit-queue Fix an else branch in trusty/configure-helper.sh Similar to #37358, for fixing #37257 on trusty.
parents 1a28117b ffe1cac5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/gce/trusty/configure-helper.sh
View file @ de03fadc
...@@ -628,7 +628,7 @@ start_kube_apiserver() { ...@@ -628,7 +628,7 @@ start_kube_apiserver() {
params="${params} --advertise-address=${vm_external_ip}" params="${params} --advertise-address=${vm_external_ip}"
params="${params} --ssh-user=${PROXY_SSH_USER}" params="${params} --ssh-user=${PROXY_SSH_USER}"
params="${params} --ssh-keyfile=/etc/srv/sshproxy/.sshkeyfile" 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}" params="${params} --advertise-address=${MASTER_ADVERTISE_ADDRESS}"
fi fi
readonly kube_apiserver_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-apiserver.docker_tag) readonly kube_apiserver_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-apiserver.docker_tag)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment