Merge pull request #54813 from dims/fix-kubeadm-log-collection

Automatic merge from submit-queue (batch tested with PRs 54875, 54813, 54595, 54947, 54766). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Do not clobber KUBERNETES_PROVIDER - fix kubeadm/gce log collection **What this PR does / why we need it**: 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. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #54813 from dims/fix-kubeadm-log-collection
f83fee37 · Kubernetes Submit Queue · GitHub · 27d42288 · 30a8a25c · f83fee37
Unverified Commit f83fee37 authored Nov 01, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 01, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

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

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
+if [[ "${KUBERNETES_PROVIDER:-}" != "kubernetes-anywhere" ]]; then
+    if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
        KUBERNETES_PROVIDER=""
-else
+    else
        KUBERNETES_PROVIDER="${KUBERNETES_PROVIDER:-gce}"
+    fi
 fi
 # PROVIDER_VARS is a list of cloud provider specific variables. Note: