github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47470 from gyuho/kubemark-etcd

Browse Source 
Automatic merge from submit-queue

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.

/cc @xiang90 @hongchaodeng
This commit is contained in:
Kubernetes Submit Queue 2017-06-14 12:10:06 -07:00 committed by GitHub
commit 037330c365
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/kubemark/resources/start-kubemark-master.sh
View File

@ -339,8 +339,12 @@ function compute-etcd-events-params {
function compute-kube-apiserver-params { function compute-kube-apiserver-params {
local params="${APISERVER_TEST_ARGS:-}" local params="${APISERVER_TEST_ARGS:-}"
params+=" --insecure-bind-address=0.0.0.0" params+=" --insecure-bind-address=0.0.0.0"
params+=" --etcd-servers=http://127.0.0.1:2379" if [[ -z "${ETCD_SERVERS:-}" ]]; then
params+=" --etcd-servers-overrides=/events#${EVENT_STORE_URL}" 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-cert-file=/etc/srv/kubernetes/server.cert"
params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key" params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key"
params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt" params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt"