diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 1094f7e5090..009ede2f075 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1461,8 +1461,12 @@ function start-kube-apiserver { params+=" --allow-privileged=true" params+=" --cloud-provider=gce" params+=" --client-ca-file=${CA_CERT_BUNDLE_PATH}" - params+=" --etcd-servers=http://127.0.0.1:2379" - params+=" --etcd-servers-overrides=/events#http://127.0.0.1:4002" + params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}" + if [[ -z "${ETCD_SERVERS:-}" ]]; then + params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-/events#http://127.0.0.1:4002}" + elif [[ -n "${ETCD_SERVERS_OVERRIDES:-}" ]]; then + params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-}" + fi params+=" --secure-port=443" params+=" --tls-cert-file=${APISERVER_SERVER_CERT_PATH}" params+=" --tls-private-key-file=${APISERVER_SERVER_KEY_PATH}" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index adc33491d22..81bde5ebeee 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -1070,6 +1070,16 @@ EOF if [ -n "${ETCD_EXTRA_ARGS:-}" ]; then cat >>$file <>$file <>$file <