Skip to content

K
k3s
Commit 9ae46359 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 962d51ec fb4a4663
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
pkg/kubectl/cmd/run.go
View file @ 9ae46359
...@@ -478,8 +478,10 @@ func handleAttachPod(f *cmdutil.Factory, c *client.Client, ns, name string, opts ...@@ -478,8 +478,10 @@ func handleAttachPod(f *cmdutil.Factory, c *client.Client, ns, name string, opts
opts.Client = c opts.Client = c
opts.PodName = name opts.PodName = name
opts.Namespace = ns 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 { 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}) req, err := f.LogsForObject(pod, &api.PodLogOptions{Container: ctrName})
if err != nil { if err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment