mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 15:58:37 +00:00
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
This commit is contained in:
commit
9ae463593c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user