Skip to content

Commit

Permalink
Merge pull request #40501 from lavalamp/fix-rel-branch
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Actually fix local-cluster-up on 1.5 branch

Fixes #38847 (for real)
  • Loading branch information
Kubernetes Submit Queue authored Jan 26, 2017
2 parents 0bd0b54 + 03fb508 commit 19f83fc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion hack/local-up-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ function start_apiserver {
# Let the API server pick a default address when API_HOST
# is set to 127.0.0.1
advertise_address=""
if [[ "${API_HOST}" != "127.0.0.1" ]]; then
if [[ "${API_HOST_IP}" != "127.0.0.1" ]]; then
advertise_address="--advertise_address=${API_HOST_IP}"
fi

Expand All @@ -368,6 +368,7 @@ function start_apiserver {
${client_ca_file_arg} \
${advertise_address} \
--v=${LOG_LEVEL} \
--anonymous-auth=true \
--cert-dir="${CERT_DIR}" \
--service-account-key-file="${SERVICE_ACCOUNT_KEY}" \
--service-account-lookup="${SERVICE_ACCOUNT_LOOKUP}" \
Expand Down

0 comments on commit 19f83fc

Please sign in to comment.