scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set

Browse Source
This commit is contained in:
Pawel Skrzynski
2016-06-28 17:34:51 +02:00
parent 9b74e24fa3
commit 50751f73ab
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/kube-util.sh
View File

@@ -22,7 +22,12 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/skeleton/util.sh" source "${KUBE_ROOT}/cluster/skeleton/util.sh"
if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
KUBERNETES_PROVIDER=""
else
KUBERNETES_PROVIDER="${KUBERNETES_PROVIDER:-gce}" KUBERNETES_PROVIDER="${KUBERNETES_PROVIDER:-gce}"
fi
PROVIDER_UTILS="${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" PROVIDER_UTILS="${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
if [ -f ${PROVIDER_UTILS} ]; then if [ -f ${PROVIDER_UTILS} ]; then
source "${PROVIDER_UTILS}" source "${PROVIDER_UTILS}"