Skip to content

K
k3s
Commit e531a778 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #26242 from metral/refactor-get

Automatic merge from submit-queue fix recursive get for proper err display - refactor code to use `Infos()` instead - fixes https://github.com/kubernetes/kubernetes/issues/26241
parents 5643b749 950612eb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
pkg/kubectl/cmd/get.go
View file @ e531a778
...@@ -219,15 +219,8 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string ...@@ -219,15 +219,8 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
return err return err
} }
infos := []*resource.Info{}
allErrs := []error{} allErrs := []error{}
err = r.Visit(func(info *resource.Info, err error) error { infos, err := r.Infos()
if err != nil {
return err
}
infos = append(infos, info)
return nil
})
if err != nil { if err != nil {
allErrs = append(allErrs, err) allErrs = append(allErrs, err)
} }
...@@ -322,5 +315,5 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string ...@@ -322,5 +315,5 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
continue continue
} }
} }
return utilerrors.NewAggregate(allErrs) return utilerrors.Flatten(utilerrors.NewAggregate(allErrs))
} }
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