github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30859 from wojtek-t/allow_custom_etcd_in_e2e

Browse Source 
Automatic merge from submit-queue

Add possibility to run non-default etcd image in tests

Ref #20504

@lavalamp @hongchaodeng @timothysc - FYI
This commit is contained in:
Kubernetes Submit Queue
2016-08-20 09:32:35 -07:00
committed by GitHub
parent eaa2b6f528 315d9f3689
commit 9030a3234f
6 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/common.sh
View File

@@ -649,6 +649,11 @@ NUM_NODES: $(yaml-quote ${NUM_NODES})
STORAGE_BACKEND: $(yaml-quote ${STORAGE_BACKEND:-})
ENABLE_GARBAGE_COLLECTOR: $(yaml-quote ${ENABLE_GARBAGE_COLLECTOR:-})
EOF
if [ -n "${TEST_ETCD_VERSION:-}" ]; then
cat >>$file <<EOF
TEST_ETCD_VERSION: $(yaml-quote ${TEST_ETCD_VERSION})
EOF
fi
if [ -n "${APISERVER_TEST_ARGS:-}" ]; then
cat >>$file <<EOF
APISERVER_TEST_ARGS: $(yaml-quote ${APISERVER_TEST_ARGS})