github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Do not clobber KUBERNETES_PROVIDER - fix kubeadm/gce log collection

Browse Source 
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.
This commit is contained in:
Davanum Srinivas 2017-10-30 16:06:39 -04:00
parent d7567cd6c7
commit 30a8a25c9d
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: