Merge pull request #55308 from liangxia/persistentVolumeValidate

Automatic merge from submit-queue (batch tested with PRs 53047, 54861, 55413, 55395, 55308). 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>. Add several validation to persistent volume **What this PR does / why we need it**: Add several unit test for persistent volume validation **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 # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55308 from liangxia/persistentVolumeValidate
4793b714 · Kubernetes Submit Queue · GitHub · 718f0bde · 890f4b7e · 4793b714
Unverified Commit 4793b714 authored Nov 10, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 70 additions and 2 deletions

validation_test.go pkg/apis/core/validation/validation_test.go +70 -2

No files found.
--- a/pkg/apis/core/validation/validation_test.go
+++ b/pkg/apis/core/validation/validation_test.go
@@ -99,6 +99,51 @@ func TestValidatePersistentVolumes(t *testing.T) {
 						Type: newHostPathType(string(core.HostPathDirectory)),
 					},
 				},
+			}),
+		},
+		"good-volume-with-capacity-unit": {
+			isExpectedFailure: false,
+			volume: testVolume("foo", "", core.PersistentVolumeSpec{
+				Capacity: core.ResourceList{
+					core.ResourceName(core.ResourceStorage): resource.MustParse("10Gi"),
+				},
+				AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
+				PersistentVolumeSource: core.PersistentVolumeSource{
+					HostPath: &core.HostPathVolumeSource{
+						Path: "/foo",
+						Type: newHostPathType(string(core.HostPathDirectory)),
+					},
+				},
+			}),
+		},
+		"good-volume-without-capacity-unit": {
+			isExpectedFailure: false,
+			volume: testVolume("foo", "", core.PersistentVolumeSpec{
+				Capacity: core.ResourceList{
+					core.ResourceName(core.ResourceStorage): resource.MustParse("10"),
+				},
+				AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
+				PersistentVolumeSource: core.PersistentVolumeSource{
+					HostPath: &core.HostPathVolumeSource{
+						Path: "/foo",
+						Type: newHostPathType(string(core.HostPathDirectory)),
+					},
+				},
+			}),
+		},
+		"good-volume-with-storage-class": {
+			isExpectedFailure: false,
+			volume: testVolume("foo", "", core.PersistentVolumeSpec{
+				Capacity: core.ResourceList{
+					core.ResourceName(core.ResourceStorage): resource.MustParse("10G"),
+				},
+				AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
+				PersistentVolumeSource: core.PersistentVolumeSource{
+					HostPath: &core.HostPathVolumeSource{
+						Path: "/foo",
+						Type: newHostPathType(string(core.HostPathDirectory)),
+					},
+				},
 				StorageClassName: "valid",
 			}),
 		},
@@ -164,6 +209,15 @@ func TestValidatePersistentVolumes(t *testing.T) {
 				},
 			}),
 		},
+		"missing-volume-source": {
+			isExpectedFailure: true,
+			volume: testVolume("foo", "", core.PersistentVolumeSpec{
+				Capacity: core.ResourceList{
+					core.ResourceName(core.ResourceStorage): resource.MustParse("10G"),
+				},
+				AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
+			}),
+		},
 		"bad-name": {
 			isExpectedFailure: true,
 			volume: testVolume("123*Bad(Name", "unexpected-namespace", core.PersistentVolumeSpec{
@@ -186,11 +240,25 @@ func TestValidatePersistentVolumes(t *testing.T) {
 					core.ResourceName(core.ResourceStorage): resource.MustParse("10G"),
 				},
 				AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
+				PersistentVolumeSource: core.PersistentVolumeSource{
+					HostPath: &core.HostPathVolumeSource{
+						Path: "/foo",
+						Type: newHostPathType(string(core.HostPathDirectory)),
+					},
+				},
 			}),
 		},
 		"missing-capacity": {
 			isExpectedFailure: true,
-			volume:            testVolume("foo", "", core.PersistentVolumeSpec{}),
+			volume: testVolume("foo", "", core.PersistentVolumeSpec{
+				AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
+				PersistentVolumeSource: core.PersistentVolumeSource{
+					HostPath: &core.HostPathVolumeSource{
+						Path: "/foo",
+						Type: newHostPathType(string(core.HostPathDirectory)),
+					},
+				},
+			}),
 		},
 		"missing-accessmodes": {
 			isExpectedFailure: true,
@@ -208,7 +276,7 @@ func TestValidatePersistentVolumes(t *testing.T) {
 		},
 		"too-many-sources": {
 			isExpectedFailure: true,
-			volume: testVolume("", "", core.PersistentVolumeSpec{
+			volume: testVolume("foo", "", core.PersistentVolumeSpec{
 				Capacity: core.ResourceList{
 					core.ResourceName(core.ResourceStorage): resource.MustParse("5G"),
 				},