From 9fc1d61ab70c3d72cb6bf16d5d6b002074a0f6cd Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 21 Jul 2016 21:42:22 -0400 Subject: [PATCH] Enable endpoints in kubernetes service started by local-cluster-up.sh --advertise_address should be set to 127.0.0.1, So let API server pick the default if necessary. Fixes #29374 --- hack/local-up-cluster.sh | 9 ++++++++- hack/verify-flags/exceptions.txt | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index af038aa7b7b..384b619f1da 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -269,8 +269,16 @@ function start_apiserver { runtime_config="--runtime-config=${RUNTIME_CONFIG}" fi + # 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 + advertise_address="--advertise_address=${API_HOST}" + fi + APISERVER_LOG=/tmp/kube-apiserver.log sudo -E "${GO_OUT}/hyperkube" apiserver ${priv_arg} ${runtime_config}\ + ${advertise_address} \ --v=${LOG_LEVEL} \ --cert-dir="${CERT_DIR}" \ --service-account-key-file="${SERVICE_ACCOUNT_KEY}" \ @@ -279,7 +287,6 @@ function start_apiserver { --bind-address="${API_BIND_ADDR}" \ --insecure-bind-address="${API_HOST_IP}" \ --insecure-port="${API_PORT}" \ - --advertise-address="${API_HOST_IP}" \ --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \ --service-cluster-ip-range="10.0.0.0/24" \ --cloud-provider="${CLOUD_PROVIDER}" \ diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 9d946b224a3..c6b074d64eb 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -13,17 +13,16 @@ cluster/gce/configure-vm.sh: api_servers: '${KUBERNETES_MASTER_NAME}' cluster/gce/configure-vm.sh: cloud_config: ${CLOUD_CONFIG} cluster/gce/configure-vm.sh: env-to-grains "runtime_config" cluster/gce/configure-vm.sh: kubelet_api_servers: '${KUBELET_APISERVER}' -cluster/gce/coreos/node-helper.sh:# cloud_config yaml file should be passed cluster/gce/gci/configure-helper.sh: reconcile_cidr="false" cluster/gce/gci/configure-helper.sh: local api_servers="--master=https://${KUBERNETES_MASTER_NAME}" cluster/gce/gci/configure-helper.sh: local reconcile_cidr="true" cluster/gce/gci/configure-helper.sh: sed -i -e "s@{{pillar\['allow_privileged'\]}}@true@g" "${src_file}" cluster/gce/trusty/configure-helper.sh: sed -i -e "s@{{pillar\['allow_privileged'\]}}@true@g" "${src_file}" cluster/gce/util.sh: local node_ip=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \ -cluster/juju/layers/kubernetes/reactive/k8s.py: cluster_name = 'kubernetes' cluster/juju/layers/kubernetes/reactive/k8s.py: check_call(split(cmd.format(kubeconfig, cluster_name, server, ca))) cluster/juju/layers/kubernetes/reactive/k8s.py: check_call(split(cmd.format(kubeconfig, context, cluster_name, user))) cluster/juju/layers/kubernetes/reactive/k8s.py: client_key = '/srv/kubernetes/client.key' +cluster/juju/layers/kubernetes/reactive/k8s.py: cluster_name = 'kubernetes' cluster/juju/layers/kubernetes/reactive/k8s.py: tlslib.client_key(None, client_key, user='ubuntu', group='ubuntu') cluster/lib/logging.sh: local source_file=${BASH_SOURCE[$frame_no]} cluster/lib/logging.sh: local source_file=${BASH_SOURCE[$stack_skip]} @@ -73,7 +72,9 @@ examples/cluster-dns/images/frontend/client.py: service_address = socket.gethos examples/storage/cassandra/image/run.sh: cluster_name \ examples/storage/vitess/env.sh: node_ip=$(get_node_ip) hack/jenkins/e2e-runner.sh: local -r image_project="$1" +hack/local-up-cluster.sh: advertise_address="--advertise_address=${API_HOST}" 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="" hack/test-update-storage-objects.sh: local storage_media_type=${2:-""} hack/test-update-storage-objects.sh: local storage_versions=${1:-""}