Skip to content

Commit b125bdd

Browse files
author
Matthew Wong
committed
Don't overwrite PVC with nil/empty object returned by failed Update
1 parent a51d574 commit b125bdd

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
@@ -157,8 +157,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa
157157

158158
ginkgo.By("Expanding current pvc")
159159
newSize := resource.MustParse("6Gi")
160-
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c)
160+
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c)
161161
framework.ExpectNoError(err, "While updating pvc for more size")
162+
pvc = newPVC
162163
gomega.Expect(pvc).NotTo(gomega.BeNil())
163164

164165
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
@@ -143,7 +143,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
143143
newSize := currentPvcSize.DeepCopy()
144144
newSize.Add(resource.MustParse("1Gi"))
145145
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
146-
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
146+
_, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
147147
framework.ExpectError(err, "While updating non-expandable PVC")
148148
})
149149
} else {
@@ -170,8 +170,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
170170
newSize := currentPvcSize.DeepCopy()
171171
newSize.Add(resource.MustParse("1Gi"))
172172
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
173-
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
173+
newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
174174
framework.ExpectNoError(err, "While updating pvc for more size")
175+
l.resource.pvc = newPVC
175176
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
176177

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

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

0 commit comments

Comments
 (0)