From ee9a3db147fa9d3cf73bb47cfcdc90fa102abc75 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 5 Feb 2019 23:13:08 +0200 Subject: [PATCH] kubeadm: use 'gce' when dumping logs --- kubetest/anywhere.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubetest/anywhere.go b/kubetest/anywhere.go index d10bd8614f64..e69130cb7d8f 100644 --- a/kubetest/anywhere.go +++ b/kubetest/anywhere.go @@ -268,7 +268,7 @@ func (k *kubernetesAnywhere) DumpClusterLogs(localPath, gcsPath string) error { } // the e2e framework in k/k does not support the "kubernetes-anywhere" provider, - // while the same provider is required by the k/k "./cluster/log-dump/log-dump.sh" script + // while a valid provider is required by the k/k "./cluster/log-dump/log-dump.sh" script // for dumping the logs of the GCE cluster that kubernetes-anywhere creates: // https://github.com/kubernetes/kubernetes/blob/master/cluster/log-dump/log-dump.sh // this fix is quite messy, but an acceptable workaround until "anywhere.go" is removed completely. @@ -277,7 +277,7 @@ func (k *kubernetesAnywhere) DumpClusterLogs(localPath, gcsPath string) error { // not use log-dump.sh. providerKey := "KUBERNETES_PROVIDER" oldValue := os.Getenv(providerKey) - if err := os.Setenv(providerKey, "kubernetes-anywhere"); err != nil { + if err := os.Setenv(providerKey, "gce"); err != nil { return err } err := defaultDumpClusterLogs(localPath, gcsPath)