Skip to content

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

Merge pull request #68120 from wojtek-t/configurable_etcd_servers

Automatic merge from submit-queue (batch tested with PRs 67756, 64149, 68076, 68131, 68120). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Allow for configuring etcd servers addresses in gce
parents 240a086c 122b7a5f
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 2 deletions
cluster/gce/gci/configure-helper.sh
View file @ eff30a31
...@@ -1461,8 +1461,12 @@ function start-kube-apiserver { ...@@ -1461,8 +1461,12 @@ function start-kube-apiserver {
params+=" --allow-privileged=true" params+=" --allow-privileged=true"
params+=" --cloud-provider=gce" params+=" --cloud-provider=gce"
params+=" --client-ca-file=${CA_CERT_BUNDLE_PATH}" params+=" --client-ca-file=${CA_CERT_BUNDLE_PATH}"
params+=" --etcd-servers=http://127.0.0.1:2379" params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}"
params+=" --etcd-servers-overrides=/events#http://127.0.0.1:4002" 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+=" --secure-port=443"
params+=" --tls-cert-file=${APISERVER_SERVER_CERT_PATH}" params+=" --tls-cert-file=${APISERVER_SERVER_CERT_PATH}"
params+=" --tls-private-key-file=${APISERVER_SERVER_KEY_PATH}" params+=" --tls-private-key-file=${APISERVER_SERVER_KEY_PATH}"
......
cluster/gce/util.sh
View file @ eff30a31
...@@ -1072,6 +1072,16 @@ EOF ...@@ -1072,6 +1072,16 @@ EOF
ETCD_EXTRA_ARGS: $(yaml-quote ${ETCD_EXTRA_ARGS}) ETCD_EXTRA_ARGS: $(yaml-quote ${ETCD_EXTRA_ARGS})
EOF EOF
fi fi
if [ -n "${ETCD_SERVERS:-}" ]; then
cat >>$file <<EOF
ETCD_SERVERS: $(yaml-quote ${ETCD_SERVERS})
EOF
fi
if [ -n "${ETCD_SERVERS_OVERRIDES:-}" ]; then
cat >>$file <<EOF
ETCD_SERVERS_OVERRIDES: $(yaml-quote ${ETCD_SERVERS_OVERRIDES})
EOF
fi
if [ -n "${APISERVER_TEST_ARGS:-}" ]; then if [ -n "${APISERVER_TEST_ARGS:-}" ]; then
cat >>$file <<EOF cat >>$file <<EOF
APISERVER_TEST_ARGS: $(yaml-quote ${APISERVER_TEST_ARGS}) APISERVER_TEST_ARGS: $(yaml-quote ${APISERVER_TEST_ARGS})
......
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