github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-01 18:45:29 -07:00 committed by GitHub
commit f83fee3709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/kube-util.sh
View File

@ -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: