Merge pull request #79104 from avorima/refactor_vol_resize_unit_tests

Refactor online volume resize unit tests

pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go

@@ -569,97 +569,145 @@ func TestCreateVolumeSpec_Invalid_Block_VolumeMounts(t *testing.T) {
 
 func TestCheckVolumeFSResize(t *testing.T) {
 	mode := v1.PersistentVolumeFilesystem
-	pv := &v1.PersistentVolume{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "dswp-test-volume-name",
-		},
-		Spec: v1.PersistentVolumeSpec{
-			PersistentVolumeSource: v1.PersistentVolumeSource{RBD: &v1.RBDPersistentVolumeSource{}},
-			Capacity:               volumeCapacity(1),
-			ClaimRef:               &v1.ObjectReference{Namespace: "ns", Name: "file-bound"},
-			VolumeMode:             &mode,
-		},
-	}
-	pvc := &v1.PersistentVolumeClaim{
-		Spec: v1.PersistentVolumeClaimSpec{
-			VolumeName: "dswp-test-volume-name",
-			Resources: v1.ResourceRequirements{
-				Requests: volumeCapacity(1),
-			},
-		},
-		Status: v1.PersistentVolumeClaimStatus{
-			Phase:    v1.ClaimBound,
-			Capacity: volumeCapacity(1),
-		},
-	}
-	dswp, fakePodManager, fakeDSW := createDswpWithVolume(t, pv, pvc)
-	fakeASW := dswp.actualStateOfWorld
 
-	// create pod
+	setCapacity := func(pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim, capacity int) {
-	containers := []v1.Container{
+		pv.Spec.Capacity = volumeCapacity(capacity)
+		pvc.Spec.Resources.Requests = volumeCapacity(capacity)
+	}
+
+	testcases := []struct {
+		resize       func(*testing.T, *v1.PersistentVolume, *v1.PersistentVolumeClaim, *desiredStateOfWorldPopulator)
+		verify       func(*testing.T, []v1.UniqueVolumeName, v1.UniqueVolumeName)
+		enableResize bool
+		readOnlyVol  bool
+	}{
 		{
-			VolumeMounts: []v1.VolumeMount{
+			// No resize request for volume, volumes in ASW shouldn't be marked as fsResizeRequired
-				{
+			resize: func(*testing.T, *v1.PersistentVolume, *v1.PersistentVolumeClaim, *desiredStateOfWorldPopulator) {
-					Name:      "dswp-test-volume-name",
+			},
-					MountPath: "/mnt",
+			verify: func(t *testing.T, vols []v1.UniqueVolumeName, _ v1.UniqueVolumeName) {
+				if len(vols) > 0 {
+					t.Errorf("No resize request for any volumes, but found resize required volumes in ASW: %v", vols)
+				}
+			},
+			enableResize: true,
+		},
+		{
+			// Disable the feature gate, so volume shouldn't be marked as fsResizeRequired
+			resize: func(_ *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim, _ *desiredStateOfWorldPopulator) {
+				setCapacity(pv, pvc, 2)
+			},
+			verify: func(t *testing.T, vols []v1.UniqueVolumeName, _ v1.UniqueVolumeName) {
+				if len(vols) > 0 {
+					t.Errorf("Feature gate disabled, but found resize required volumes in ASW: %v", vols)
+				}
+			},
+			enableResize: false,
+		},
+		{
+			// Make volume used as ReadOnly, so volume shouldn't be marked as fsResizeRequired
+			resize: func(_ *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim, _ *desiredStateOfWorldPopulator) {
+				setCapacity(pv, pvc, 2)
+			},
+			verify: func(t *testing.T, vols []v1.UniqueVolumeName, _ v1.UniqueVolumeName) {
+				if len(vols) > 0 {
+					t.Errorf("volume mounted as ReadOnly, but found resize required volumes in ASW: %v", vols)
+				}
+			},
+			readOnlyVol:  true,
+			enableResize: true,
+		},
+		{
+			// Clear ASW, so volume shouldn't be marked as fsResizeRequired because they are not mounted
+			resize: func(_ *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim, dswp *desiredStateOfWorldPopulator) {
+				setCapacity(pv, pvc, 2)
+				clearASW(dswp.actualStateOfWorld, dswp.desiredStateOfWorld, t)
+			},
+			verify: func(t *testing.T, vols []v1.UniqueVolumeName, _ v1.UniqueVolumeName) {
+				if len(vols) > 0 {
+					t.Errorf("volume hasn't been mounted, but found resize required volumes in ASW: %v", vols)
+				}
+			},
+			enableResize: true,
+		},
+		{
+			// volume in ASW should be marked as fsResizeRequired
+			resize: func(_ *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim, _ *desiredStateOfWorldPopulator) {
+				setCapacity(pv, pvc, 2)
+			},
+			verify: func(t *testing.T, vols []v1.UniqueVolumeName, volName v1.UniqueVolumeName) {
+				if len(vols) == 0 {
+					t.Fatalf("Request resize for volume, but volume in ASW hasn't been marked as fsResizeRequired")
+				}
+				if len(vols) != 1 {
+					t.Errorf("Some unexpected volumes are marked as fsResizeRequired: %v", vols)
+				}
+				if vols[0] != volName {
+					t.Fatalf("Mark wrong volume as fsResizeRequired: %s", vols[0])
+				}
+			},
+			enableResize: true,
+		},
+	}
+
+	for _, tc := range testcases {
+		pv := &v1.PersistentVolume{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "dswp-test-volume-name",
+			},
+			Spec: v1.PersistentVolumeSpec{
+				PersistentVolumeSource: v1.PersistentVolumeSource{RBD: &v1.RBDPersistentVolumeSource{}},
+				Capacity:               volumeCapacity(1),
+				ClaimRef:               &v1.ObjectReference{Namespace: "ns", Name: "file-bound"},
+				VolumeMode:             &mode,
+			},
+		}
+		pvc := &v1.PersistentVolumeClaim{
+			Spec: v1.PersistentVolumeClaimSpec{
+				VolumeName: pv.Name,
+				Resources: v1.ResourceRequirements{
+					Requests: pv.Spec.Capacity,
 				},
 			},
-		},
+			Status: v1.PersistentVolumeClaimStatus{
-	}
+				Phase:    v1.ClaimBound,
-	pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "file-bound", containers)
+				Capacity: pv.Spec.Capacity,
-	uniquePodName := types.UniquePodName(pod.UID)
+			},
-	uniqueVolumeName := v1.UniqueVolumeName("fake-plugin/" + pod.Spec.Volumes[0].Name)
+		}
 
-	fakePodManager.AddPod(pod)
+		dswp, fakePodManager, fakeDSW := createDswpWithVolume(t, pv, pvc)
-	// Fill the dsw to contains volumes and pods.
+		fakeASW := dswp.actualStateOfWorld
-	dswp.findAndAddNewPods()
-	reconcileASW(fakeASW, fakeDSW, t)
 
-	// No resize request for volume, volumes in ASW shouldn't be marked as fsResizeRequired.
+		// create pod
-	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ExpandInUsePersistentVolumes, true)()
+		containers := []v1.Container{
-	resizeRequiredVolumes := reprocess(dswp, uniquePodName, fakeDSW, fakeASW)
+			{
-	if len(resizeRequiredVolumes) > 0 {
+				VolumeMounts: []v1.VolumeMount{
-		t.Fatalf("No resize request for any volumes, but found resize required volumes in ASW: %v", resizeRequiredVolumes)
+					{
-	}
+						Name:      pv.Name,
+						MountPath: "/mnt",
+						ReadOnly:  tc.readOnlyVol,
+					},
+				},
+			},
+		}
+		pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "file-bound", containers)
+		uniquePodName := types.UniquePodName(pod.UID)
+		uniqueVolumeName := v1.UniqueVolumeName("fake-plugin/" + pod.Spec.Volumes[0].Name)
 
-	// Add a resize request to volume.
+		fakePodManager.AddPod(pod)
-	pv.Spec.Capacity = volumeCapacity(2)
+		// Fill the dsw to contains volumes and pods.
-	pvc.Spec.Resources.Requests = volumeCapacity(2)
+		dswp.findAndAddNewPods()
+		reconcileASW(fakeASW, fakeDSW, t)
 
-	// Disable the feature gate, so volume shouldn't be marked as fsResizeRequired.
+		func() {
-	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ExpandInUsePersistentVolumes, false)()
+			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ExpandInUsePersistentVolumes, tc.enableResize)()
-	resizeRequiredVolumes = reprocess(dswp, uniquePodName, fakeDSW, fakeASW)
-	if len(resizeRequiredVolumes) > 0 {
-		t.Fatalf("Feature gate disabled, but found resize required volumes in ASW: %v", resizeRequiredVolumes)
-	}
 
-	// Make volume used as ReadOnly, so volume shouldn't be marked as fsResizeRequired.
+			tc.resize(t, pv, pvc, dswp)
-	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ExpandInUsePersistentVolumes, true)()
-	pod.Spec.Containers[0].VolumeMounts[0].ReadOnly = true
-	resizeRequiredVolumes = reprocess(dswp, uniquePodName, fakeDSW, fakeASW)
-	if len(resizeRequiredVolumes) > 0 {
-		t.Fatalf("volume mounted as ReadOnly, but found resize required volumes in ASW: %v", resizeRequiredVolumes)
-	}
 
-	// Clear ASW, so volume shouldn't be marked as fsResizeRequired because they are not mounted.
+			resizeRequiredVolumes := reprocess(dswp, uniquePodName, fakeDSW, fakeASW)
-	pod.Spec.Containers[0].VolumeMounts[0].ReadOnly = false
-	clearASW(fakeASW, fakeDSW, t)
-	resizeRequiredVolumes = reprocess(dswp, uniquePodName, fakeDSW, fakeASW)
-	if len(resizeRequiredVolumes) > 0 {
-		t.Fatalf("volume hasn't been mounted, but found resize required volumes in ASW: %v", resizeRequiredVolumes)
-	}
 
-	// volume in ASW should be marked as fsResizeRequired.
+			tc.verify(t, resizeRequiredVolumes, uniqueVolumeName)
-	reconcileASW(fakeASW, fakeDSW, t)
+		}()
-	resizeRequiredVolumes = reprocess(dswp, uniquePodName, fakeDSW, fakeASW)
-	if len(resizeRequiredVolumes) == 0 {
-		t.Fatalf("Request resize for volume, but volume in ASW hasn't been marked as fsResizeRequired")
-	}
-	if len(resizeRequiredVolumes) != 1 {
-		t.Fatalf("Some unexpected volumes are marked as fsResizeRequired: %v", resizeRequiredVolumes)
-	}
-	if resizeRequiredVolumes[0] != uniqueVolumeName {
-		t.Fatalf("Mark wrong volume as fsResizeRequired: %s", resizeRequiredVolumes[0])
 	}
 }