Merge pull request #81107 from wongma7/expand-cleanup

Don't overwrite PVC with nil/empty object returned by failed Update
This commit is contained in:
Kubernetes Prow Robot
2019-08-23 13:31:31 -07:00
committed by GitHub
5 changed files with 15 additions and 8 deletions

View File

@@ -159,8 +159,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa
ginkgo.By("Expanding current pvc")
newSize := resource.MustParse("6Gi")
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c)
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c)
framework.ExpectNoError(err, "While updating pvc for more size")
pvc = newPVC
gomega.Expect(pvc).NotTo(gomega.BeNil())
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]