From 50751f73ab62c32cf3344f6a070cb26c3259b4fd Mon Sep 17 00:00:00 2001
From: Pawel Skrzynski <pawel.skrzynski@intel.com>
Date: Tue, 28 Jun 2016 17:34:51 +0200
Subject: [PATCH] Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is
 set

---
 cluster/kube-util.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cluster/kube-util.sh b/cluster/kube-util.sh
index c6cb58fc81..5030e7f2af 100644
--- 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}"