github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-22 17:51:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix volume expansion e2e tests to use actual allocated size

Browse Source
This commit is contained in:
duanwei33
2025-11-27 12:53:51 +08:00
parent dd4d9fad24
commit 8b381028ed
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/e2e/storage/testsuites/volume_expand.go
View File

@@ -185,8 +185,16 @@ func (v *volumeExpandTestSuite) DefineTests(driver storageframework.TestDriver,
gomega.Expect(l.resource.Sc.AllowVolumeExpansion).NotTo(gomega.BeNil())
allowVolumeExpansion := *l.resource.Sc.AllowVolumeExpansion
gomega.Expect(allowVolumeExpansion).To(gomega.BeFalseBecause("expected AllowVolumeExpansion value to be false"))
// Re-fetch PVC to get the latest status with updated capacity
ginkgo.By("Re-fetching PVC to get latest status")
l.resource.Pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(l.resource.Pvc.Namespace).Get(ctx, l.resource.Pvc.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "While re-fetching PVC before expansion")
ginkgo.By("Expanding non-expandable pvc")
currentPvcSize := l.resource.Pvc.Spec.Resources.Requests[v1.ResourceStorage]
// Use Status.Capacity instead of Spec.Resources.Requests to get the actual allocated size.
// CSI drivers may allocate larger volumes than requested (e.g., due to minimum size constraints).
currentPvcSize := l.resource.Pvc.Status.Capacity[v1.ResourceStorage]
newSize := currentPvcSize.DeepCopy()
newSize.Add(expandSize)
framework.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
@@ -219,9 +227,16 @@ func (v *volumeExpandTestSuite) DefineTests(driver storageframework.TestDriver,
err = e2epod.DeletePodWithWait(ctx, f.ClientSet, l.pod)
framework.ExpectNoError(err, "while deleting pod for resizing")
// Re-fetch PVC to get the latest status with updated capacity
ginkgo.By("Re-fetching PVC to get latest status")
l.resource.Pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(l.resource.Pvc.Namespace).Get(ctx, l.resource.Pvc.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "While re-fetching PVC before expansion")
// We expand the PVC while no pod is using it to ensure offline expansion
ginkgo.By("Expanding current pvc")
currentPvcSize := l.resource.Pvc.Spec.Resources.Requests[v1.ResourceStorage]
// Use Status.Capacity instead of Spec.Resources.Requests to get the actual allocated size.
// CSI drivers may allocate larger volumes than requested (e.g., due to minimum size constraints).
currentPvcSize := l.resource.Pvc.Status.Capacity[v1.ResourceStorage]
newSize := currentPvcSize.DeepCopy()
newSize.Add(expandSize)
framework.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
@@ -291,9 +306,16 @@ func (v *volumeExpandTestSuite) DefineTests(driver storageframework.TestDriver,
ginkgo.DeferCleanup(e2epod.DeletePodWithWait, f.ClientSet, l.pod)
framework.ExpectNoError(err, "While creating pods for resizing")
// Re-fetch PVC to get the latest status with updated capacity
ginkgo.By("Re-fetching PVC to get latest status")
l.resource.Pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(l.resource.Pvc.Namespace).Get(ctx, l.resource.Pvc.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "While re-fetching PVC before expansion")
// We expand the PVC while l.pod is using it for online expansion.
ginkgo.By("Expanding current pvc")
currentPvcSize := l.resource.Pvc.Spec.Resources.Requests[v1.ResourceStorage]
// Use Status.Capacity instead of Spec.Resources.Requests to get the actual allocated size.
// CSI drivers may allocate larger volumes than requested (e.g., due to minimum size constraints).
currentPvcSize := l.resource.Pvc.Status.Capacity[v1.ResourceStorage]
newSize := currentPvcSize.DeepCopy()
newSize.Add(expandSize)
framework.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
@@ -343,9 +365,16 @@ func (v *volumeExpandTestSuite) DefineTests(driver storageframework.TestDriver,
ginkgo.DeferCleanup(e2epod.DeletePodWithWait, f.ClientSet, l.pod)
framework.ExpectNoError(err, "While creating pods for resizing")
// Re-fetch PVC to get the latest status with updated capacity
ginkgo.By("Re-fetching PVC to get latest status")
l.resource.Pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(l.resource.Pvc.Namespace).Get(ctx, l.resource.Pvc.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "While re-fetching PVC before expansion")
// We expand the PVC while l.pod is using it for online expansion.
ginkgo.By("Expanding current pvc")
currentPvcSize := l.resource.Pvc.Spec.Resources.Requests[v1.ResourceStorage]
// Use Status.Capacity instead of Spec.Resources.Requests to get the actual allocated size.
// CSI drivers may allocate larger volumes than requested (e.g., due to minimum size constraints).
currentPvcSize := l.resource.Pvc.Status.Capacity[v1.ResourceStorage]
newSize := currentPvcSize.DeepCopy()
newSize.Add(expandSize)
framework.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)