Merge pull request #28164 from intelsdi-x/dont_set_provider_for_conformance_tests

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

Merge pull request #28164 from intelsdi-x/dont_set_provider_for_conformance_tests
febd37b1 · k8s-merge-robot · GitHub · 339c6924 · 50751f73 · febd37b1
Commit febd37b1 authored Jul 14, 2016 by k8s-merge-robot Committed by GitHub Jul 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

kube-util.sh cluster/kube-util.sh +6 -1

No files found.
--- a/cluster/kube-util.sh
+++ b/cluster/kube-util.sh
@@ -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}"