From ab1ebbc79c300f99b4efa2099daa6262a309135e Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 13 Jun 2017 16:17:22 -0700 Subject: [PATCH] test/kubemark/resources: configure custom etcd endpoints We want to stress our own etcd cluster with Kubernetes workloads, using kubemark e2e tests. This PR adds a new environment variable 'ETCD_SERVERS' to configure custom etcd endpoints. Signed-off-by: Gyu-Ho Lee --- test/kubemark/resources/start-kubemark-master.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh index cea2932b3fd..5b47bdb072c 100755 --- a/test/kubemark/resources/start-kubemark-master.sh +++ b/test/kubemark/resources/start-kubemark-master.sh @@ -339,8 +339,12 @@ function compute-etcd-events-params { function compute-kube-apiserver-params { local params="${APISERVER_TEST_ARGS:-}" params+=" --insecure-bind-address=0.0.0.0" - params+=" --etcd-servers=http://127.0.0.1:2379" - params+=" --etcd-servers-overrides=/events#${EVENT_STORE_URL}" + if [[ -z "${ETCD_SERVERS:-}" ]]; then + params+=" --etcd-servers=http://127.0.0.1:2379" + params+=" --etcd-servers-overrides=/events#${EVENT_STORE_URL}" + else + params+=" --etcd-servers=${ETCD_SERVERS}" + fi params+=" --tls-cert-file=/etc/srv/kubernetes/server.cert" params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key" params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt"