Merge pull request #30497 from ping035627/ping035627-patch-0811

Automatic merge from submit-queue Add validation conditions for autoscale When validate the value of max and min in autoscale.go, it should append all the invalid conditions to errs, and print the value.

Merge pull request #30497 from ping035627/ping035627-patch-0811
c07ef716 · Kubernetes Submit Queue · GitHub · 6bbc9993 · bc3b74a4 · c07ef716
Commit c07ef716 authored Aug 17, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

autoscale.go pkg/kubectl/cmd/autoscale.go +4 -3

No files found.
--- a/pkg/kubectl/cmd/autoscale.go
+++ b/pkg/kubectl/cmd/autoscale.go
@@ -198,9 +198,10 @@ func validateFlags(cmd *cobra.Command) error {
 	errs := []error{}
 	max, min := cmdutil.GetFlagInt(cmd, "max"), cmdutil.GetFlagInt(cmd, "min")
 	if max < 1 {
-		errs = append(errs, fmt.Errorf("--max=MAXPODS is required and must be at least 1"))
-	} else if max < min {
-		errs = append(errs, fmt.Errorf("--max=MAXPODS must be larger or equal to --min=MINPODS"))
+		errs = append(errs, fmt.Errorf("--max=MAXPODS is required and must be at least 1, max: %d", max))
+	}
+	if max < min {
+		errs = append(errs, fmt.Errorf("--max=MAXPODS must be larger or equal to --min=MINPODS, max: %d, min: %d", max, min))
 	}
 	return utilerrors.NewAggregate(errs)
 }