Merge pull request #55164 from NickrenREN/validation-not-zero

Automatic merge from submit-queue (batch tested with PRs 49258, 55164). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Make sure that storage request of pvc is not zero I do not know whether we should add the checking zero logic to `ValidateResourceQuantityValue`. But at lease we should do this when validate PVC. If PVC requests 0Gi storage,it does not make sense to provision that volume. Volume plugins will not check whether the request of PVC is 0 when they run `CreateVolume` or `CreateImage` called by `Provision()` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #55163 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55164 from NickrenREN/validation-not-zero
28e0c3be · Kubernetes Submit Queue · GitHub · 91615e4f · 3a22b5f5 · 28e0c3be
Unverified Commit 28e0c3be authored Nov 12, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 0 deletions

validation.go pkg/apis/core/validation/validation.go +4 -0

validation_test.go pkg/apis/core/validation/validation_test.go +22 -0

No files found.
--- a/pkg/apis/core/validation/validation.go
+++ b/pkg/apis/core/validation/validation.go
@@ -62,6 +62,7 @@ const isNegativeErrorMsg string = apimachineryvalidation.IsNegativeErrorMsg
 const isInvalidQuotaResource string = `must be a standard resource for quota`
 const fieldImmutableErrorMsg string = genericvalidation.FieldImmutableErrorMsg
 const isNotIntegerErrorMsg string = `must be an integer`
+const isZeroErrorMsg string = `must be greater than zero`
 var pdPartitionErrorMsg string = validation.InclusiveRangeError(1, 255)
 var volumeModeErrorMsg string = "must be a number between 0 and 0777 (octal), both inclusive"
@@ -1601,6 +1602,9 @@ func ValidatePersistentVolumeClaimSpec(spec *core.PersistentVolumeClaimSpec, fld
 		allErrs = append(allErrs, field.Required(fldPath.Child("resources").Key(string(core.ResourceStorage)), ""))
 	} else {
 		allErrs = append(allErrs, ValidateResourceQuantityValue(string(core.ResourceStorage), storageValue, fldPath.Child("resources").Key(string(core.ResourceStorage)))...)
+		if storageValue.Value() == int64(0) {
+			allErrs = append(allErrs, field.Invalid(fldPath, storageValue, isZeroErrorMsg))
+		}
 	}
 	if spec.StorageClassName != nil && len(*spec.StorageClassName) > 0 {

--- a/pkg/apis/core/validation/validation_test.go
+++ b/pkg/apis/core/validation/validation_test.go
@@ -833,6 +833,28 @@ func TestValidatePersistentVolumeClaim(t *testing.T) {
 				},
 			}),
 		},
+		"zero-storage-request": {
+			isExpectedFailure: true,
+			claim: testVolumeClaim("foo", "ns", core.PersistentVolumeClaimSpec{
+				Selector: &metav1.LabelSelector{
+					MatchExpressions: []metav1.LabelSelectorRequirement{
+						{
+							Key:      "key2",
+							Operator: "Exists",
+						},
+					},
+				},
+				AccessModes: []core.PersistentVolumeAccessMode{
+					core.ReadWriteOnce,
+					core.ReadOnlyMany,
+				},
+				Resources: core.ResourceRequirements{
+					Requests: core.ResourceList{
+						core.ResourceName(api.ResourceStorage): resource.MustParse("0G"),
+					},
+				},
+			}),
+		},
 		"invalid-storage-class-name": {
 			isExpectedFailure: true,
 			claim: testVolumeClaim("foo", "ns", core.PersistentVolumeClaimSpec{