Skip to content

K
k3s
Commit 73e497fb authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35437 from markturansky/loosen_pvc_limit_range_validation

Automatic merge from submit-queue Loosened validation on PVC LimitRanger This PR loosens validation on PVC LimitRanger so that either Min or Max are required, but not both. Per @derekwaynecarr https://github.com/openshift/origin/pull/11396#discussion_r84533061
parents c52efa57 a3f4d8a5
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 19 deletions
pkg/api/validation/validation.go
View file @ 73e497fb
...@@ -3047,11 +3047,8 @@ func ValidateLimitRange(limitRange *api.LimitRange) field.ErrorList { ...@@ -3047,11 +3047,8 @@ func ValidateLimitRange(limitRange *api.LimitRange) field.ErrorList {
if limit.Type == api.LimitTypePersistentVolumeClaim { if limit.Type == api.LimitTypePersistentVolumeClaim {
_, minQuantityFound := limit.Min[api.ResourceStorage] _, minQuantityFound := limit.Min[api.ResourceStorage]
_, maxQuantityFound := limit.Max[api.ResourceStorage] _, maxQuantityFound := limit.Max[api.ResourceStorage]
if !minQuantityFound { if !minQuantityFound && !maxQuantityFound {
allErrs = append(allErrs, field.Required(idxPath.Child("min"), "minimum storage value is required")) allErrs = append(allErrs, field.Required(idxPath.Child("limits"), "either minimum or maximum storage value is required, but neither was provided"))
}
if !maxQuantityFound {
allErrs = append(allErrs, field.Required(idxPath.Child("max"), "maximum storage value is required"))
} }
} }
......
pkg/api/validation/validation_test.go
View file @ 73e497fb
...@@ -7070,6 +7070,28 @@ func TestValidateLimitRange(t *testing.T) { ...@@ -7070,6 +7070,28 @@ func TestValidateLimitRange(t *testing.T) {
}, },
}, },
{ {
name: "pvc-min-only",
spec: api.LimitRangeSpec{
Limits: []api.LimitRangeItem{
{
Type: api.LimitTypePersistentVolumeClaim,
Min: getStorageResourceList("5Gi"),
},
},
},
},
{
name: "pvc-max-only",
spec: api.LimitRangeSpec{
Limits: []api.LimitRangeItem{
{
Type: api.LimitTypePersistentVolumeClaim,
Max: getStorageResourceList("10Gi"),
},
},
},
},
{
name: "all-fields-valid-big-numbers", name: "all-fields-valid-big-numbers",
spec: api.LimitRangeSpec{ spec: api.LimitRangeSpec{
Limits: []api.LimitRangeItem{ Limits: []api.LimitRangeItem{
...@@ -7276,27 +7298,15 @@ func TestValidateLimitRange(t *testing.T) { ...@@ -7276,27 +7298,15 @@ func TestValidateLimitRange(t *testing.T) {
}}, }},
"must be a standard limit type or fully qualified", "must be a standard limit type or fully qualified",
}, },
"invalid missing required min field": { "min and max values missing, one required": {
api.LimitRange{ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "foo"}, Spec: api.LimitRangeSpec{
Limits: []api.LimitRangeItem{
{
Type: api.LimitTypePersistentVolumeClaim,
Max: getStorageResourceList("10000T"),
},
},
}},
"minimum storage value is required",
},
"invalid missing required max field": {
api.LimitRange{ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "foo"}, Spec: api.LimitRangeSpec{ api.LimitRange{ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "foo"}, Spec: api.LimitRangeSpec{
Limits: []api.LimitRangeItem{ Limits: []api.LimitRangeItem{
{ {
Type: api.LimitTypePersistentVolumeClaim, Type: api.LimitTypePersistentVolumeClaim,
Min: getStorageResourceList("10000T"),
}, },
}, },
}}, }},
"maximum storage value is required", "either minimum or maximum storage value is required, but neither was provided",
}, },
"invalid min greater than max": { "invalid min greater than max": {
api.LimitRange{ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "foo"}, Spec: api.LimitRangeSpec{ api.LimitRange{ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: "foo"}, Spec: api.LimitRangeSpec{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment