From 30a8a25c9dbc8acd412a2e041e3ed2f293f8499c Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Mon, 30 Oct 2017 16:06:39 -0400
Subject: [PATCH] Do not clobber KUBERNETES_PROVIDER - fix kubeadm/gce log
 collection

This gets in the way of correct log collection for at least
the kubeadm/gce jobs. Not sure if this piece of code is needed
any more.
---
 cluster/kube-util.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cluster/kube-util.sh b/cluster/kube-util.sh
index d144508bf08..b35fddf4f6e 100755
--- a/cluster/kube-util.sh
+++ b/cluster/kube-util.sh
@@ -22,10 +22,12 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 source "${KUBE_ROOT}/cluster/skeleton/util.sh"
 
-if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
-    KUBERNETES_PROVIDER=""
-else
-    KUBERNETES_PROVIDER="${KUBERNETES_PROVIDER:-gce}"
+if [[ "${KUBERNETES_PROVIDER:-}" != "kubernetes-anywhere" ]]; then
+    if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
+        KUBERNETES_PROVIDER=""
+    else
+        KUBERNETES_PROVIDER="${KUBERNETES_PROVIDER:-gce}"
+    fi
 fi
 
 # PROVIDER_VARS is a list of cloud provider specific variables. Note: