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 #69111 from rajansandeep/clustername

Browse Source 
Adapt e2e tests for cluster-domain other than cluster.local
This commit is contained in:
k8s-ci-robot
2018-11-01 23:45:22 -07:00
committed by GitHub
parent 45550cadbe 4c8a65ac01
commit 5581f52c0f
8 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/ginkgo-e2e.sh
View File

@@ -161,6 +161,7 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}"
--master-tag="${MASTER_TAG:-}" \
--cluster-monitoring-mode="${KUBE_ENABLE_CLUSTER_MONITORING:-standalone}" \
--prometheus-monitoring="${KUBE_ENABLE_PROMETHEUS_MONITORING:-false}" \
--dns-domain="${KUBE_DNS_DOMAIN:-cluster.local}" \
${KUBE_CONTAINER_RUNTIME:+"--container-runtime=${KUBE_CONTAINER_RUNTIME}"} \
${MASTER_OS_DISTRIBUTION:+"--master-os-distro=${MASTER_OS_DISTRIBUTION}"} \
${NODE_OS_DISTRIBUTION:+"--node-os-distro=${NODE_OS_DISTRIBUTION}"} \