From 8ec61c1dce53241b5b1da7eb786b7f7d833f20ac Mon Sep 17 00:00:00 2001 From: PingWang Date: Mon, 29 Aug 2016 17:17:51 +0800 Subject: [PATCH] return all the invalid parameters for set_image Signed-off-by: PingWang --- pkg/kubectl/cmd/set/set_image.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/set/set_image.go b/pkg/kubectl/cmd/set/set_image.go index f894c49a32..998c3eec34 100644 --- a/pkg/kubectl/cmd/set/set_image.go +++ b/pkg/kubectl/cmd/set/set_image.go @@ -147,15 +147,16 @@ func (o *ImageOptions) Complete(f *cmdutil.Factory, cmd *cobra.Command, args []s } func (o *ImageOptions) Validate() error { + errors := []error{} if len(o.Resources) < 1 && len(o.Filenames) == 0 { - return fmt.Errorf("one or more resources must be specified as or /") + errors = append(errors, fmt.Errorf("one or more resources must be specified as or /")) } if len(o.ContainerImages) < 1 { - return fmt.Errorf("at least one image update is required") + errors = append(errors, fmt.Errorf("at least one image update is required")) } else if len(o.ContainerImages) > 1 && hasWildcardKey(o.ContainerImages) { - return fmt.Errorf("all containers are already specified by *, but saw more than one container_name=container_image pairs") + errors = append(errors, fmt.Errorf("all containers are already specified by *, but saw more than one container_name=container_image pairs")) } - return nil + return utilerrors.NewAggregate(errors) } func (o *ImageOptions) Run() error {