github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass config to external Kubemark cluster in e2e tests

Browse Source 
When cluster autoscaler is used in kubemark tests,
pass default kubeconfig as external cluster config.
This commit is contained in:
Beata Skiba 2017-08-11 10:14:52 +02:00
parent a227c1ea2c
commit ec73d28e1b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/kubemark/gce/config-default.sh
View File

@ -92,3 +92,6 @@ KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_LOG_LEVEL} ${TEST_CLUSTER_API_CONTENT_TYPE
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
ALLOCATE_NODE_CIDRS=true ALLOCATE_NODE_CIDRS=true
# Optional: Enable cluster autoscaler.
ENABLE_KUBEMARK_CLUSTER_AUTOSCALER="${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER:-false}"

4
test/kubemark/run-e2e-tests.sh
View File

@ -38,6 +38,10 @@ else
ARGS=$@ ARGS=$@
fi fi
if [[ "${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER}" == "true" ]]; then
ARGS="${ARGS} --kubemark-external-kubeconfig=${DEFAULT_KUBECONFIG}"
fi
if [[ -f /.dockerenv ]]; then if [[ -f /.dockerenv ]]; then
# Running inside a dockerized runner. # Running inside a dockerized runner.
go run ./hack/e2e.go -- -v --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}" go run ./hack/e2e.go -- -v --check-version-skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}"