github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

return all the invalid flags for rollingupdate

Browse Source 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
This commit is contained in:
PingWang 2016-08-29 15:11:01 +08:00
parent 6fcbbe8663
commit 6ca2c36e71
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubectl/cmd/rollingupdate.go
View File

@ -34,6 +34,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
) )
@ -115,31 +116,31 @@ func validateArguments(cmd *cobra.Command, filenames, args []string) error {
image := cmdutil.GetFlagString(cmd, "image") image := cmdutil.GetFlagString(cmd, "image")
rollback := cmdutil.GetFlagBool(cmd, "rollback") rollback := cmdutil.GetFlagBool(cmd, "rollback")
errors := []error{}
if len(deploymentKey) == 0 { if len(deploymentKey) == 0 {
return cmdutil.UsageError(cmd, "--deployment-label-key can not be empty") errors = append(errors, cmdutil.UsageError(cmd, "--deployment-label-key can not be empty"))
} }
if len(filenames) > 1 { if len(filenames) > 1 {
return cmdutil.UsageError(cmd, "May only specify a single filename for new controller") errors = append(errors, cmdutil.UsageError(cmd, "May only specify a single filename for new controller"))
} }
if !rollback { if !rollback {
if len(filenames) == 0 && len(image) == 0 { if len(filenames) == 0 && len(image) == 0 {
return cmdutil.UsageError(cmd, "Must specify --filename or --image for new controller") errors = append(errors, cmdutil.UsageError(cmd, "Must specify --filename or --image for new controller"))
} } else if len(filenames) != 0 && len(image) != 0 {
if len(filenames) != 0 && len(image) != 0 { errors = append(errors, cmdutil.UsageError(cmd, "--filename and --image can not both be specified"))
return cmdutil.UsageError(cmd, "--filename and --image can not both be specified")
} }
} else { } else {
if len(filenames) != 0 || len(image) != 0 { if len(filenames) != 0 || len(image) != 0 {
return cmdutil.UsageError(cmd, "Don't specify --filename or --image on rollback") errors = append(errors, cmdutil.UsageError(cmd, "Don't specify --filename or --image on rollback"))
} }
} }
if len(args) < 1 { if len(args) < 1 {
return cmdutil.UsageError(cmd, "Must specify the controller to update") errors = append(errors, cmdutil.UsageError(cmd, "Must specify the controller to update"))
} }
return nil return utilerrors.NewAggregate(errors)
} }
func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string, options *RollingUpdateOptions) error { func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string, options *RollingUpdateOptions) error {