Merge pull request #33582 from aanm/fixing-local-cluster-up

Automatic merge from submit-queue Fixing local cluster up hack: fix local-cluster-up advertise_address default value Fixes: 9fc1d61aSigned-off-by: André Martins <aanm90@gmail.com> ping @dims

Merge pull request #33582 from aanm/fixing-local-cluster-up
364caad0 · Kubernetes Submit Queue · GitHub · d187997c · 3dfd3249 · 364caad0
Commit 364caad0 authored Sep 29, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

local-up-cluster.sh hack/local-up-cluster.sh +1 -1

exceptions.txt hack/verify-flags/exceptions.txt +1 -1

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -293,7 +293,7 @@ function start_apiserver {
    # is set to 127.0.0.1
    advertise_address=""
    if [[ "${API_HOST}" != "127.0.0.1" ]]; then
-        advertise_address="--advertise_address=${API_HOST}"
+        advertise_address="--advertise_address=${API_HOST_IP}"
    fi
    APISERVER_LOG=/tmp/kube-apiserver.log

--- a/hack/verify-flags/exceptions.txt
+++ b/hack/verify-flags/exceptions.txt
@@ -85,7 +85,7 @@ federation/deploy/config.json.sample:      "cluster_name": "cluster3-kubernetes"
 federation/deploy/config.json.sample:      "num_nodes": 3,
 federation/deploy/config.json.sample:      "num_nodes": 3,
 federation/deploy/config.json.sample:      "num_nodes": 3,
-hack/local-up-cluster.sh:        advertise_address="--advertise_address=${API_HOST}"
+hack/local-up-cluster.sh:        advertise_address="--advertise_address=${API_HOST_IP}"
 hack/local-up-cluster.sh:      runtime_config="--runtime-config=${RUNTIME_CONFIG}"
 hack/local-up-cluster.sh:    advertise_address=""
 hack/local-up-cluster.sh:    runtime_config=""