Skip to content

Commit 220498b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#81107 from wongma7/expand-cleanup
Don't overwrite PVC with nil/empty object returned by failed Update
2 parents d52b212 + b125bdd commit 220498b

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

‎test/e2e/storage/csi_mock_volume.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
470470

471471
ginkgo.By("Expanding current pvc")
472472
newSize := resource.MustParse("6Gi")
473-
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, m.cs)
473+
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, m.cs)
474474
framework.ExpectNoError(err, "While updating pvc for more size")
475+
pvc = newPVC
475476
gomega.Expect(pvc).NotTo(gomega.BeNil())
476477

477478
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
@@ -561,8 +562,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
561562

562563
ginkgo.By("Expanding current pvc")
563564
newSize := resource.MustParse("6Gi")
564-
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, m.cs)
565+
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, m.cs)
565566
framework.ExpectNoError(err, "While updating pvc for more size")
567+
pvc = newPVC
566568
gomega.Expect(pvc).NotTo(gomega.BeNil())
567569

568570
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

‎test/e2e/storage/flexvolume_mounted_volume_resize.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() {
159159

160160
ginkgo.By("Expanding current pvc")
161161
newSize := resource.MustParse("6Gi")
162-
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c)
162+
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c)
163163
framework.ExpectNoError(err, "While updating pvc for more size")
164+
pvc = newPVC
164165
gomega.Expect(pvc).NotTo(gomega.BeNil())
165166

166167
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

‎test/e2e/storage/flexvolume_online_resize.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa
159159

160160
ginkgo.By("Expanding current pvc")
161161
newSize := resource.MustParse("6Gi")
162-
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c)
162+
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c)
163163
framework.ExpectNoError(err, "While updating pvc for more size")
164+
pvc = newPVC
164165
gomega.Expect(pvc).NotTo(gomega.BeNil())
165166

166167
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

‎test/e2e/storage/mounted_volume_resize.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ var _ = utils.SIGDescribe("Mounted volume expand", func() {
131131

132132
ginkgo.By("Expanding current pvc")
133133
newSize := resource.MustParse("6Gi")
134-
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c)
134+
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c)
135135
framework.ExpectNoError(err, "While updating pvc for more size")
136+
pvc = newPVC
136137
gomega.Expect(pvc).NotTo(gomega.BeNil())
137138

138139
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

‎test/e2e/storage/testsuites/volume_expand.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
146146
newSize := currentPvcSize.DeepCopy()
147147
newSize.Add(resource.MustParse("1Gi"))
148148
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
149-
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
149+
_, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
150150
framework.ExpectError(err, "While updating non-expandable PVC")
151151
})
152152
} else {
@@ -173,8 +173,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
173173
newSize := currentPvcSize.DeepCopy()
174174
newSize.Add(resource.MustParse("1Gi"))
175175
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
176-
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
176+
newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
177177
framework.ExpectNoError(err, "While updating pvc for more size")
178+
l.resource.pvc = newPVC
178179
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
179180

180181
pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage]
@@ -232,8 +233,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
232233
newSize := currentPvcSize.DeepCopy()
233234
newSize.Add(resource.MustParse("1Gi"))
234235
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
235-
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
236+
newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
236237
framework.ExpectNoError(err, "While updating pvc for more size")
238+
l.resource.pvc = newPVC
237239
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
238240

239241
pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage]

0 commit comments

Comments
 (0)