From 8593c026655912e95621344a917b830340ed6759 Mon Sep 17 00:00:00 2001 From: Pingan2017 Date: Thu, 27 Sep 2018 18:59:20 +0800 Subject: [PATCH 1/2] fix panic: kubectl rollout undo --- pkg/kubectl/cmd/rollout/rollout_pause.go | 12 ++---------- pkg/kubectl/cmd/rollout/rollout_resume.go | 12 ++---------- pkg/kubectl/cmd/rollout/rollout_undo.go | 13 ++----------- 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index e9ba5a86ae1..5ebca90cae7 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 25443355512..fe182533494 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 d2150089ee4..8c64f7ca738 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, } From 96d01da215904594bf87cc2ddd96895bca9c15fd Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Thu, 27 Sep 2018 15:10:52 +0200 Subject: [PATCH 2/2] Fix panic in kubectl rollout commands --- pkg/kubectl/cmd/rollout/rollout_history.go | 3 ++- pkg/kubectl/cmd/rollout/rollout_pause.go | 25 +++++++++++++--------- pkg/kubectl/cmd/rollout/rollout_resume.go | 12 +++++++---- pkg/kubectl/cmd/rollout/rollout_status.go | 8 +++---- pkg/kubectl/cmd/rollout/rollout_undo.go | 14 ++++++++---- 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/pkg/kubectl/cmd/rollout/rollout_history.go index a2a79449471..e58c9262fde 100644 --- a/pkg/kubectl/cmd/rollout/rollout_history.go +++ b/pkg/kubectl/cmd/rollout/rollout_history.go @@ -81,6 +81,7 @@ func NewCmdRolloutHistory(f cmdutil.Factory, streams genericclioptions.IOStreams Example: history_example, Run: func(cmd *cobra.Command, args []string) { cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.Validate()) cmdutil.CheckErr(o.Run()) }, ValidArgs: validArgs, @@ -118,7 +119,7 @@ func (o *RolloutHistoryOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, func (o *RolloutHistoryOptions) Validate() error { if len(o.Resources) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { - return fmt.Errorf("Required resource not specified.") + return fmt.Errorf("required resource not specified") } if o.Revision < 0 { return fmt.Errorf("revision must be a positive integer: %v", o.Revision) diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index 5ebca90cae7..34f2616b67a 100644 --- a/pkg/kubectl/cmd/rollout/rollout_pause.go +++ b/pkg/kubectl/cmd/rollout/rollout_pause.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) -// PauseConfig is the start of the data required to perform the operation. As new fields are added, add them here instead of +// PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of // referencing the cmd.Flags() -type PauseConfig struct { +type PauseOptions struct { PrintFlags *genericclioptions.PrintFlags ToPrinter func(string) (printers.ResourcePrinter, error) @@ -67,7 +67,7 @@ var ( ) func NewCmdRolloutPause(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command { - o := &PauseConfig{ + o := &PauseOptions{ PrintFlags: genericclioptions.NewPrintFlags("paused").WithTypeSetter(scheme.Scheme), IOStreams: streams, } @@ -82,6 +82,7 @@ func NewCmdRolloutPause(f cmdutil.Factory, streams genericclioptions.IOStreams) Example: pause_example, Run: func(cmd *cobra.Command, args []string) { cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.Validate()) cmdutil.CheckErr(o.RunPause()) }, ValidArgs: validArgs, @@ -94,15 +95,12 @@ func NewCmdRolloutPause(f cmdutil.Factory, streams genericclioptions.IOStreams) return cmd } -func (o *PauseConfig) Complete(f cmdutil.Factory, cmd *cobra.Command, args []string) error { - if len(args) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { - return cmdutil.UsageErrorf(cmd, "%s", cmd.Use) - } - +func (o *PauseOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []string) error { o.Pauser = polymorphichelpers.ObjectPauserFn var err error - if o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace(); err != nil { + o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() + if err != nil { return err } @@ -117,7 +115,14 @@ func (o *PauseConfig) Complete(f cmdutil.Factory, cmd *cobra.Command, args []str return nil } -func (o PauseConfig) RunPause() error { +func (o *PauseOptions) Validate() error { + if len(o.Resources) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { + return fmt.Errorf("required resource not specified") + } + return nil +} + +func (o PauseOptions) RunPause() error { r := o.Builder(). WithScheme(legacyscheme.Scheme). NamespaceParam(o.Namespace).DefaultNamespace(). diff --git a/pkg/kubectl/cmd/rollout/rollout_resume.go b/pkg/kubectl/cmd/rollout/rollout_resume.go index fe182533494..8e518937bff 100644 --- a/pkg/kubectl/cmd/rollout/rollout_resume.go +++ b/pkg/kubectl/cmd/rollout/rollout_resume.go @@ -85,6 +85,7 @@ func NewCmdRolloutResume(f cmdutil.Factory, streams genericclioptions.IOStreams) Example: resume_example, Run: func(cmd *cobra.Command, args []string) { cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.Validate()) cmdutil.CheckErr(o.RunResume()) }, ValidArgs: validArgs, @@ -97,10 +98,6 @@ func NewCmdRolloutResume(f cmdutil.Factory, streams genericclioptions.IOStreams) } func (o *ResumeOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []string) error { - if len(args) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { - return cmdutil.UsageErrorf(cmd, "%s", cmd.Use) - } - o.Resources = args o.Resumer = polymorphichelpers.ObjectResumerFn @@ -121,6 +118,13 @@ func (o *ResumeOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []s return nil } +func (o *ResumeOptions) Validate() error { + if len(o.Resources) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { + return fmt.Errorf("required resource not specified") + } + return nil +} + func (o ResumeOptions) RunResume() error { r := o.Builder(). WithScheme(legacyscheme.Scheme). diff --git a/pkg/kubectl/cmd/rollout/rollout_status.go b/pkg/kubectl/cmd/rollout/rollout_status.go index 160f4e845b3..a61242766d7 100644 --- a/pkg/kubectl/cmd/rollout/rollout_status.go +++ b/pkg/kubectl/cmd/rollout/rollout_status.go @@ -102,7 +102,7 @@ func NewCmdRolloutStatus(f cmdutil.Factory, streams genericclioptions.IOStreams) Example: status_example, Run: func(cmd *cobra.Command, args []string) { cmdutil.CheckErr(o.Complete(f, args)) - cmdutil.CheckErr(o.Validate(cmd, args)) + cmdutil.CheckErr(o.Validate()) cmdutil.CheckErr(o.Run()) }, ValidArgs: validArgs, @@ -144,9 +144,9 @@ func (o *RolloutStatusOptions) Complete(f cmdutil.Factory, args []string) error return nil } -func (o *RolloutStatusOptions) Validate(cmd *cobra.Command, args []string) error { - if len(args) == 0 && cmdutil.IsFilenameSliceEmpty(o.FilenameOptions.Filenames) { - return cmdutil.UsageErrorf(cmd, "Required resource not specified.") +func (o *RolloutStatusOptions) Validate() error { + if len(o.BuilderArgs) == 0 && cmdutil.IsFilenameSliceEmpty(o.FilenameOptions.Filenames) { + return fmt.Errorf("required resource not specified") } if o.Revision < 0 { diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index 8c64f7ca738..b7e287fb4d7 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -17,6 +17,8 @@ limitations under the License. package rollout import ( + "fmt" + "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" @@ -84,6 +86,7 @@ func NewCmdRolloutUndo(f cmdutil.Factory, streams genericclioptions.IOStreams) * Example: undo_example, Run: func(cmd *cobra.Command, args []string) { cmdutil.CheckErr(o.Complete(f, cmd, args)) + cmdutil.CheckErr(o.Validate()) cmdutil.CheckErr(o.RunUndo()) }, ValidArgs: validArgs, @@ -98,10 +101,6 @@ func NewCmdRolloutUndo(f cmdutil.Factory, streams genericclioptions.IOStreams) * } func (o *UndoOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []string) error { - if len(args) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { - return cmdutil.UsageErrorf(cmd, "Required resource not specified.") - } - o.Resources = args o.DryRun = cmdutil.GetDryRunFlag(cmd) @@ -124,6 +123,13 @@ func (o *UndoOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []str return err } +func (o *UndoOptions) Validate() error { + if len(o.Resources) == 0 && cmdutil.IsFilenameSliceEmpty(o.Filenames) { + return fmt.Errorf("required resource not specified") + } + return nil +} + func (o *UndoOptions) RunUndo() error { r := o.Builder(). WithScheme(legacyscheme.Scheme).