From ec73d28e1b01606ea79b53700835fca408346fcb Mon Sep 17 00:00:00 2001 From: Beata Skiba Date: Fri, 11 Aug 2017 10:14:52 +0200 Subject: [PATCH] Pass config to external Kubemark cluster in e2e tests When cluster autoscaler is used in kubemark tests, pass default kubeconfig as external cluster config. --- cluster/kubemark/gce/config-default.sh | 3 +++ test/kubemark/run-e2e-tests.sh | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 616f8ad4775..e794b451ba9 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -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 ALLOCATE_NODE_CIDRS=true + +# Optional: Enable cluster autoscaler. +ENABLE_KUBEMARK_CLUSTER_AUTOSCALER="${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER:-false}" diff --git a/test/kubemark/run-e2e-tests.sh b/test/kubemark/run-e2e-tests.sh index aeb039410f4..c605474897a 100755 --- a/test/kubemark/run-e2e-tests.sh +++ b/test/kubemark/run-e2e-tests.sh @@ -38,6 +38,10 @@ else ARGS=$@ fi +if [[ "${ENABLE_KUBEMARK_CLUSTER_AUTOSCALER}" == "true" ]]; then + ARGS="${ARGS} --kubemark-external-kubeconfig=${DEFAULT_KUBECONFIG}" +fi + if [[ -f /.dockerenv ]]; then # 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}"