Merge pull request #34514 from derekwaynecarr/validation-fixes

Automatic merge from submit-queue requests.storage is a standard resource name The value `requests.storage` is a valid standard resource name but was omitted from the standard list.

Merge pull request #34514 from derekwaynecarr/validation-fixes
41c9bbcc · Kubernetes Submit Queue · GitHub · 5fcb9fd0 · d5c45e88 · 41c9bbcc
Commit 41c9bbcc authored Oct 19, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

helpers.go pkg/api/helpers.go +1 -0

validation_test.go pkg/api/validation/validation_test.go +6 -0

No files found.
--- a/pkg/api/helpers.go
+++ b/pkg/api/helpers.go
@@ -171,6 +171,7 @@ var standardResources = sets.NewString(
 	string(ResourceConfigMaps),
 	string(ResourcePersistentVolumeClaims),
 	string(ResourceStorage),
+	string(ResourceRequestsStorage),
 )

 // IsStandardResourceName returns true if the resource is known to the system

--- a/pkg/api/validation/validation_test.go
+++ b/pkg/api/validation/validation_test.go
@@ -6495,6 +6495,12 @@ func TestValidateResourceNames(t *testing.T) {
 	}{
 		{"memory", true, ""},
 		{"cpu", true, ""},
+		{"storage", true, ""},
+		{"requests.cpu", true, ""},
+		{"requests.memory", true, ""},
+		{"requests.storage", true, ""},
+		{"limits.cpu", true, ""},
+		{"limits.memory", true, ""},
 		{"network", false, ""},
 		{"disk", false, ""},
 		{"", false, ""},