fix GPU resource validation incorrectly allows zero limits

2017-08-07 10:13:11 +08:00
parent 4bfe9b1a56
commit a8742a0643
4 changed files with 220 additions and 20 deletions
--- a/pkg/api/v1/validation/validation_test.go
+++ b/pkg/api/v1/validation/validation_test.go
@@ -0,0 +1,179 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package validation
+
+import (
+	"testing"
+
+	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+)
+
+func TestValidateResourceRequirements(t *testing.T) {
+	successCase := []struct {
+		Name         string
+		requirements v1.ResourceRequirements
+	}{
+		{
+			Name: "GPU only setting Limits",
+			requirements: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("10"),
+				},
+			},
+		},
+		{
+			Name: "GPU setting Limits equals Requests",
+			requirements: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("10"),
+				},
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("10"),
+				},
+			},
+		},
+		{
+			Name: "Resources with GPU with Requests",
+			requirements: v1.ResourceRequirements{
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):       resource.MustParse("10"),
+					v1.ResourceName(v1.ResourceMemory):    resource.MustParse("10G"),
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("1"),
+				},
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):       resource.MustParse("10"),
+					v1.ResourceName(v1.ResourceMemory):    resource.MustParse("10G"),
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("1"),
+				},
+			},
+		},
+		{
+			Name: "Resources with only Limits",
+			requirements: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):    resource.MustParse("10"),
+					v1.ResourceName(v1.ResourceMemory): resource.MustParse("10G"),
+					v1.ResourceName("my.org/resource"): resource.MustParse("10"),
+				},
+			},
+		},
+		{
+			Name: "Resources with only Requests",
+			requirements: v1.ResourceRequirements{
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):    resource.MustParse("10"),
+					v1.ResourceName(v1.ResourceMemory): resource.MustParse("10G"),
+					v1.ResourceName("my.org/resource"): resource.MustParse("10"),
+				},
+			},
+		},
+		{
+			Name: "Resources with Requests Less Than Limits",
+			requirements: v1.ResourceRequirements{
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):    resource.MustParse("9"),
+					v1.ResourceName(v1.ResourceMemory): resource.MustParse("9G"),
+					v1.ResourceName("my.org/resource"): resource.MustParse("9"),
+				},
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):    resource.MustParse("10"),
+					v1.ResourceName(v1.ResourceMemory): resource.MustParse("10G"),
+					v1.ResourceName("my.org/resource"): resource.MustParse("9"),
+				},
+			},
+		},
+	}
+	for _, tc := range successCase {
+		if errs := ValidateResourceRequirements(&tc.requirements, field.NewPath("resources")); len(errs) != 0 {
+			t.Errorf("%q unexpected error: %v", tc.Name, errs)
+		}
+	}
+
+	errorCase := []struct {
+		Name         string
+		requirements v1.ResourceRequirements
+	}{
+		{
+			Name: "GPU only setting Requests",
+			requirements: v1.ResourceRequirements{
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("10"),
+				},
+			},
+		},
+		{
+			Name: "GPU setting Limits less than Requests",
+			requirements: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("10"),
+				},
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("11"),
+				},
+			},
+		},
+		{
+			Name: "GPU setting Limits larger than Requests",
+			requirements: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("10"),
+				},
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceNvidiaGPU): resource.MustParse("9"),
+				},
+			},
+		},
+		{
+			Name: "Resources with Requests Larger Than Limits",
+			requirements: v1.ResourceRequirements{
+				Requests: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):    resource.MustParse("10"),
+					v1.ResourceName(v1.ResourceMemory): resource.MustParse("10G"),
+					v1.ResourceName("my.org/resource"): resource.MustParse("10m"),
+				},
+				Limits: v1.ResourceList{
+					v1.ResourceName(v1.ResourceCPU):    resource.MustParse("9"),
+					v1.ResourceName(v1.ResourceMemory): resource.MustParse("9G"),
+					v1.ResourceName("my.org/resource"): resource.MustParse("9m"),
+				},
+			},
+		},
+		{
+			Name: "Invalid Resources with Requests",
+			requirements: v1.ResourceRequirements{
+				Requests: v1.ResourceList{
+					v1.ResourceName("my.org"): resource.MustParse("10m"),
+				},
+			},
+		},
+		{
+			Name: "Invalid Resources with Limits",
+			requirements: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceName("my.org"): resource.MustParse("9m"),
+				},
+			},
+		},
+	}
+	for _, tc := range errorCase {
+		if errs := ValidateResourceRequirements(&tc.requirements, field.NewPath("resources")); len(errs) == 0 {
+			t.Errorf("%q expected error", tc.Name)
+		}
+	}
+}