github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #50506 from bskiba/external_config 

Automatic merge from submit-queue (batch tested with PRs 50485, 49951, 50508, 50511, 50506)

Pass config to external Kubemark cluster in e2e tests

When cluster autoscaler is used in kubemark tests,
pass default kubeconfig as external cluster config.

@shyamjvs @gmarek 

**Release note**:
```
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-08-11 20:38:01 -07:00 committed by GitHub
parent b0e066eed2 ec73d28e1b
commit 276bfb8cf1
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
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=$@
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}"