github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change validation for local ephemeral storage

Browse Source
This commit is contained in:
NickrenREN
2017-08-24 12:43:06 +08:00
parent 27901ad5df
commit 9730e3d302
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/helper/helpers.go
View File

@@ -107,6 +107,7 @@ func IsResourceQuotaScopeValidForResource(scope api.ResourceQuotaScope, resource
var standardContainerResources = sets.NewString( var standardContainerResources = sets.NewString(
string(api.ResourceCPU), string(api.ResourceCPU),
string(api.ResourceMemory), string(api.ResourceMemory),
string(api.ResourceEphemeralStorage),
) )
// IsStandardContainerResourceName returns true if the container can make a resource request // IsStandardContainerResourceName returns true if the container can make a resource request
@@ -194,10 +195,13 @@ func IsStandardQuotaResourceName(str string) bool {
var standardResources = sets.NewString( var standardResources = sets.NewString(
string(api.ResourceCPU), string(api.ResourceCPU),
string(api.ResourceMemory), string(api.ResourceMemory),
string(api.ResourceEphemeralStorage),
string(api.ResourceRequestsCPU), string(api.ResourceRequestsCPU),
string(api.ResourceRequestsMemory), string(api.ResourceRequestsMemory),
string(api.ResourceRequestsEphemeralStorage),
string(api.ResourceLimitsCPU), string(api.ResourceLimitsCPU),
string(api.ResourceLimitsMemory), string(api.ResourceLimitsMemory),
string(api.ResourceLimitsEphemeralStorage),
string(api.ResourcePods), string(api.ResourcePods),
string(api.ResourceQuotas), string(api.ResourceQuotas),
string(api.ResourceServices), string(api.ResourceServices),

4
pkg/api/validation/validation.go
View File

@@ -3783,8 +3783,8 @@ func ValidateResourceRequirements(requirements *api.ResourceRequirements, fldPat
// Validate resource quantity. // Validate resource quantity.
allErrs = append(allErrs, ValidateResourceQuantityValue(string(resourceName), quantity, fldPath)...) allErrs = append(allErrs, ValidateResourceQuantityValue(string(resourceName), quantity, fldPath)...)
if resourceName == api.ResourceStorageOverlay && !utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) { if resourceName == api.ResourceEphemeralStorage && !utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
allErrs = append(allErrs, field.Forbidden(limPath, "ResourceStorageOverlay field disabled by feature-gate for ResourceRequirements")) allErrs = append(allErrs, field.Forbidden(limPath, "ResourceEphemeralStorage field disabled by feature-gate for ResourceRequirements"))
} }
} }
for resourceName, quantity := range requirements.Requests { for resourceName, quantity := range requirements.Requests {

2
pkg/api/validation/validation_test.go
View File

@@ -2683,7 +2683,7 @@ func TestAlphaLocalStorageCapacityIsolation(t *testing.T) {
containerLimitCase := api.ResourceRequirements{ containerLimitCase := api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
api.ResourceStorageOverlay: *resource.NewMilliQuantity( api.ResourceEphemeralStorage: *resource.NewMilliQuantity(
int64(40000), int64(40000),
resource.BinarySI), resource.BinarySI),
}, },