Merge pull request kubernetes#131593 from gnufied/check-for-recovery-related-fields

Check for newer resizing related fields after expansion is successful

Author: k8s-ci-robot

test/e2e/storage/testsuites/volume_expand.go

@@ -256,6 +256,8 @@ func (v *volumeExpandTestSuite) DefineTests(driver storageframework.TestDriver,
 
 			pvcConditions := l.resource.Pvc.Status.Conditions
 			gomega.Expect(pvcConditions).To(gomega.BeEmpty(), "pvc should not have conditions")
+			err = VerifyRecoveryRelatedFields(l.resource.Pvc)
+			framework.ExpectNoError(err, "while verifying recovery related fields")
 		})
 
 		ginkgo.It("should resize volume when PVC is edited while pod is using it", func(ctx context.Context) {
@@ -305,6 +307,9 @@ func (v *volumeExpandTestSuite) DefineTests(driver storageframework.TestDriver,
 
 			pvcConditions := l.resource.Pvc.Status.Conditions
 			gomega.Expect(pvcConditions).To(gomega.BeEmpty(), "pvc should not have conditions")
+
+			err = VerifyRecoveryRelatedFields(l.resource.Pvc)
+			framework.ExpectNoError(err, "while verifying recovery related fields")
 		})
 
 	}
@@ -483,3 +488,18 @@ func WaitForFSResize(ctx context.Context, pvc *v1.PersistentVolumeClaim, c clien
 	}
 	return updatedPVC, nil
 }
+
+func VerifyRecoveryRelatedFields(pvc *v1.PersistentVolumeClaim) error {
+	resizeStatus := pvc.Status.AllocatedResourceStatuses[v1.ResourceStorage]
+	if resizeStatus != "" {
+		return fmt.Errorf("pvc %q had %s resize status, expected none", pvc.Name, resizeStatus)
+	}
+
+	allocatedSize := pvc.Status.AllocatedResources[v1.ResourceStorage]
+	requestedSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
+	// at this point allocatedSize should be greater than pvc resource request
+	if allocatedSize.Cmp(requestedSize) < 0 {
+		return fmt.Errorf("pvc %q had %s allocated size, expected %s", pvc.Name, allocatedSize.String(), requestedSize.String())
+	}
+	return nil
+}