From eea9994112bd6a5e17c7b09aeece7f4f20f13baa Mon Sep 17 00:00:00 2001 From: Pingan2017 Date: Tue, 30 Oct 2018 15:01:24 +0800 Subject: [PATCH] code cleanup for kubectl top --- pkg/kubectl/cmd/top/top_node.go | 12 +++--------- pkg/kubectl/cmd/top/top_pod.go | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/pkg/kubectl/cmd/top/top_node.go b/pkg/kubectl/cmd/top/top_node.go index 8250c099d0..48e7f48e0c 100644 --- a/pkg/kubectl/cmd/top/top_node.go +++ b/pkg/kubectl/cmd/top/top_node.go @@ -106,15 +106,9 @@ func NewCmdTopNode(f cmdutil.Factory, o *TopNodeOptions, streams genericclioptio Long: topNodeLong, Example: topNodeExample, Run: func(cmd *cobra.Command, args []string) { - if err := o.Complete(f, cmd, args); err != nil { - cmdutil.CheckErr(err) - } - if err := o.Validate(); err != nil { - cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, "%v", err)) - } - if err := o.RunTopNode(); err != nil { - cmdutil.CheckErr(err) - } + cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.Validate()) + cmdutil.CheckErr(o.RunTopNode()) }, Aliases: []string{"nodes", "no"}, } diff --git a/pkg/kubectl/cmd/top/top_pod.go b/pkg/kubectl/cmd/top/top_pod.go index 8ffccc1b4c..c8f87d558e 100644 --- a/pkg/kubectl/cmd/top/top_pod.go +++ b/pkg/kubectl/cmd/top/top_pod.go @@ -95,15 +95,9 @@ func NewCmdTopPod(f cmdutil.Factory, o *TopPodOptions, streams genericclioptions Long: topPodLong, Example: topPodExample, Run: func(cmd *cobra.Command, args []string) { - if err := o.Complete(f, cmd, args); err != nil { - cmdutil.CheckErr(err) - } - if err := o.Validate(); err != nil { - cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, "%v", err)) - } - if err := o.RunTopPod(); err != nil { - cmdutil.CheckErr(err) - } + cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.Validate()) + cmdutil.CheckErr(o.RunTopPod()) }, Aliases: []string{"pods", "po"}, }