mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
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:
commit
220498b83a
@ -470,8 +470,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
|
||||
|
||||
ginkgo.By("Expanding current pvc")
|
||||
newSize := resource.MustParse("6Gi")
|
||||
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, m.cs)
|
||||
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, m.cs)
|
||||
framework.ExpectNoError(err, "While updating pvc for more size")
|
||||
pvc = newPVC
|
||||
gomega.Expect(pvc).NotTo(gomega.BeNil())
|
||||
|
||||
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
|
||||
@ -561,8 +562,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
|
||||
|
||||
ginkgo.By("Expanding current pvc")
|
||||
newSize := resource.MustParse("6Gi")
|
||||
pvc, err = testsuites.ExpandPVCSize(pvc, newSize, m.cs)
|
||||
newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, m.cs)
|
||||
framework.ExpectNoError(err, "While updating pvc for more size")
|
||||
pvc = newPVC
|
||||
gomega.Expect(pvc).NotTo(gomega.BeNil())
|
||||
|
||||
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
|
||||
|
@ -159,8 +159,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() {
|
||||
|
||||
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]
|
||||
|
@ -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]
|
||||
|
@ -131,8 +131,9 @@ var _ = utils.SIGDescribe("Mounted volume expand", func() {
|
||||
|
||||
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]
|
||||
|
@ -146,7 +146,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
|
||||
newSize := currentPvcSize.DeepCopy()
|
||||
newSize.Add(resource.MustParse("1Gi"))
|
||||
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
|
||||
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
|
||||
_, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
|
||||
framework.ExpectError(err, "While updating non-expandable PVC")
|
||||
})
|
||||
} else {
|
||||
@ -173,8 +173,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
|
||||
newSize := currentPvcSize.DeepCopy()
|
||||
newSize.Add(resource.MustParse("1Gi"))
|
||||
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
|
||||
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
|
||||
newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
|
||||
framework.ExpectNoError(err, "While updating pvc for more size")
|
||||
l.resource.pvc = newPVC
|
||||
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
|
||||
|
||||
pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage]
|
||||
@ -232,8 +233,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
|
||||
newSize := currentPvcSize.DeepCopy()
|
||||
newSize.Add(resource.MustParse("1Gi"))
|
||||
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize)
|
||||
l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
|
||||
newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet)
|
||||
framework.ExpectNoError(err, "While updating pvc for more size")
|
||||
l.resource.pvc = newPVC
|
||||
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
|
||||
|
||||
pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage]
|
||||
|
Loading…
Reference in New Issue
Block a user