github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84150 from langyenan/fix-e2e

Browse Source 
set default value of KUBE_MASTER_URL to empty in e2e test
This commit is contained in:
Kubernetes Prow Robot 2019-10-22 00:19:24 -07:00 committed by GitHub
commit 780e40d424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/ginkgo-e2e.sh
View File

@ -74,7 +74,11 @@ else
prepare-e2e prepare-e2e
detect-master >/dev/null detect-master >/dev/null
KUBE_MASTER_URL="${KUBE_MASTER_URL:-https://${KUBE_MASTER_IP:-}}"
KUBE_MASTER_URL="${KUBE_MASTER_URL:-}"
if [[ -z "${KUBE_MASTER_URL:-}" && -n "${KUBE_MASTER_IP:-}" ]]; then
KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
fi
auth_config=( auth_config=(
"--kubeconfig=${KUBECONFIG:-$DEFAULT_KUBECONFIG}" "--kubeconfig=${KUBECONFIG:-$DEFAULT_KUBECONFIG}"