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.

Do not clobber KUBERNETES_PROVIDER - fix kubeadm/gce log collection
30a8a25c · Davanum Srinivas · d7567cd6 · 30a8a25c
Commit 30a8a25c authored Oct 30, 2017 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

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

No files found.
--- 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: