github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-01 01:08:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28164 from intelsdi-x/dont_set_provider_for_conformance_tests

Browse Source 
Automatic merge from submit-queue

Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set

fixes #26269
same as #26530 - i accidentally lost my fork and couldn't rebase there ;)
@mikedanese PTAL
This commit is contained in:
k8s-merge-robot
2016-07-14 02:53:08 -07:00
committed by GitHub
parent 339c6924b2 50751f73ab
commit febd37b148
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/kube-util.sh
View File

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