Merge pull request kubernetes#37789 from yarntime/check_min_max

Automatic merge from submit-queue check the value of min and max in kubectl check the value of min and max in kubectl.
weiliang-ms · Dec 5, 2016 · 513893c · 513893c
2 parents bc34200 + 4bbc3ba
commit 513893c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/kubectl/autoscale.go b/pkg/kubectl/autoscale.go
@@ -97,6 +97,11 @@ func generateHPA(genericParams map[string]interface{}) (runtime.Object, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	if min > max {
+		return nil, fmt.Errorf("'max' must be greater than or equal to 'min'.")
+	}
+
 	cpuString, found := params["cpu-percent"]
 	cpu := -1
 	if found {