Skip to content

K
k3s
Commit ec73d28e authored by Beata Skiba's avatar Beata Skiba
Browse files
Options

Pass config to external Kubemark cluster in e2e tests

When cluster autoscaler is used in kubemark tests, pass default kubeconfig as external cluster config.
parent a227c1ea
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
cluster/kubemark/gce/config-default.sh
View file @ ec73d28e
...@@ -92,3 +92,6 @@ KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_LOG_LEVEL} ${TEST_CLUSTER_API_CONTENT_TYPE ...@@ -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}"
test/kubemark/run-e2e-tests.sh
View file @ ec73d28e
...@@ -38,6 +38,10 @@ else ...@@ -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}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment