Merge pull request #32212 from fraenkel/save_stderr

Automatic merge from submit-queue Save stderr since it may become nil fixes #32206 opts.Run() may set Err to nil

Merge pull request #32212 from fraenkel/save_stderr
9ae46359 · Kubernetes Submit Queue · GitHub · 962d51ec · fb4a4663 · 9ae46359
Commit 9ae46359 authored Sep 07, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

run.go pkg/kubectl/cmd/run.go +3 -1

No files found.
--- a/pkg/kubectl/cmd/run.go
+++ b/pkg/kubectl/cmd/run.go
@@ -478,8 +478,10 @@ func handleAttachPod(f *cmdutil.Factory, c *client.Client, ns, name string, opts
 	opts.Client = c
 	opts.PodName = name
 	opts.Namespace = ns
+	// TODO: opts.Run sets opts.Err to nil, we need to find a better way
+	stderr := opts.Err
 	if err := opts.Run(); err != nil {
-		fmt.Fprintf(opts.Err, "Error attaching, falling back to logs: %v\n", err)
+		fmt.Fprintf(stderr, "Error attaching, falling back to logs: %v\n", err)
 		req, err := f.LogsForObject(pod, &api.PodLogOptions{Container: ctrName})
 		if err != nil {
 			return err