From 6424a2bc632fc5cee7a4b477201f74cd36fd824b Mon Sep 17 00:00:00 2001 From: kargakis Date: Thu, 21 May 2015 15:05:34 +0200 Subject: [PATCH] resize: Enable resource type/name syntax Also don't allow more than one objects in commands it makes sense --- pkg/kubectl/cmd/describe.go | 3 +++ pkg/kubectl/cmd/resize.go | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/kubectl/cmd/describe.go b/pkg/kubectl/cmd/describe.go index c128c014362..57bedd3764f 100644 --- a/pkg/kubectl/cmd/describe.go +++ b/pkg/kubectl/cmd/describe.go @@ -86,6 +86,9 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s } return err } + if len(infos) > 1 { + return fmt.Errorf("multiple resources provided: %v", args) + } info := infos[0] s, err := describer.Describe(info.Namespace, info.Name) diff --git a/pkg/kubectl/cmd/resize.go b/pkg/kubectl/cmd/resize.go index 50a7dbf4d7e..ec02caa654f 100644 --- a/pkg/kubectl/cmd/resize.go +++ b/pkg/kubectl/cmd/resize.go @@ -65,7 +65,7 @@ func NewCmdResize(f *cmdutil.Factory, out io.Writer) *cobra.Command { func RunResize(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string) error { count := cmdutil.GetFlagInt(cmd, "replicas") - if len(args) != 2 || count < 0 { + if count < 0 { return cmdutil.UsageError(cmd, "--replicas=COUNT RESOURCE ID") } @@ -94,6 +94,9 @@ func RunResize(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str if err != nil { return err } + if len(infos) > 1 { + return fmt.Errorf("multiple resources provided: %v", args) + } info := infos[0] resizer, err := f.Resizer(mapping)