Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kubeadm: use 'gce' when dumping logs #11131

Merged
merged 1 commit into from
Feb 5, 2019
Merged

kubeadm: use 'gce' when dumping logs #11131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kubetest/anywhere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh this is fine

return err
}
err := defaultDumpClusterLogs(localPath, gcsPath)
Expand Down