diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index e9ba5a86ae..5ebca90cae 100644 --- a/pkg/kubectl/cmd/rollout/rollout_pause.go +++ b/pkg/kubectl/cmd/rollout/rollout_pause.go @@ -81,16 +81,8 @@ func NewCmdRolloutPause(f cmdutil.Factory, streams genericclioptions.IOStreams) Long: pause_long, Example: pause_example, Run: func(cmd *cobra.Command, args []string) { - allErrs := []error{} - err := o.Complete(f, cmd, args) - if err != nil { - allErrs = append(allErrs, err) - } - err = o.RunPause() - if err != nil { - allErrs = append(allErrs, err) - } - cmdutil.CheckErr(utilerrors.Flatten(utilerrors.NewAggregate(allErrs))) + cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.RunPause()) }, ValidArgs: validArgs, } diff --git a/pkg/kubectl/cmd/rollout/rollout_resume.go b/pkg/kubectl/cmd/rollout/rollout_resume.go index 2544335551..fe18253349 100644 --- a/pkg/kubectl/cmd/rollout/rollout_resume.go +++ b/pkg/kubectl/cmd/rollout/rollout_resume.go @@ -84,16 +84,8 @@ func NewCmdRolloutResume(f cmdutil.Factory, streams genericclioptions.IOStreams) Long: resume_long, Example: resume_example, Run: func(cmd *cobra.Command, args []string) { - allErrs := []error{} - err := o.Complete(f, cmd, args) - if err != nil { - allErrs = append(allErrs, err) - } - err = o.RunResume() - if err != nil { - allErrs = append(allErrs, err) - } - cmdutil.CheckErr(utilerrors.Flatten(utilerrors.NewAggregate(allErrs))) + cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.RunResume()) }, ValidArgs: validArgs, } diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index d2150089ee..8c64f7ca73 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -20,7 +20,6 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" @@ -84,16 +83,8 @@ func NewCmdRolloutUndo(f cmdutil.Factory, streams genericclioptions.IOStreams) * Long: undo_long, Example: undo_example, Run: func(cmd *cobra.Command, args []string) { - allErrs := []error{} - err := o.Complete(f, cmd, args) - if err != nil { - allErrs = append(allErrs, err) - } - err = o.RunUndo() - if err != nil { - allErrs = append(allErrs, err) - } - cmdutil.CheckErr(utilerrors.Flatten(utilerrors.NewAggregate(allErrs))) + cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.RunUndo()) }, ValidArgs: validArgs, }