github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81107 from wongma7/expand-cleanup

Browse Source 
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
commit 220498b83a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/storage/csi_mock_volume.go
View File

@ -470,8 +470,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
ginkgo.By("Expanding current pvc") ginkgo.By("Expanding current pvc")
newSize := resource.MustParse("6Gi") 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") framework.ExpectNoError(err, "While updating pvc for more size")
pvc = newPVC
gomega.Expect(pvc).NotTo(gomega.BeNil()) gomega.Expect(pvc).NotTo(gomega.BeNil())
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
@ -561,8 +562,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
ginkgo.By("Expanding current pvc") ginkgo.By("Expanding current pvc")
newSize := resource.MustParse("6Gi") 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") framework.ExpectNoError(err, "While updating pvc for more size")
pvc = newPVC
gomega.Expect(pvc).NotTo(gomega.BeNil()) gomega.Expect(pvc).NotTo(gomega.BeNil())
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

3
test/e2e/storage/flexvolume_mounted_volume_resize.go
View File

@ -159,8 +159,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() {
ginkgo.By("Expanding current pvc") ginkgo.By("Expanding current pvc")
newSize := resource.MustParse("6Gi") 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") framework.ExpectNoError(err, "While updating pvc for more size")
pvc = newPVC
gomega.Expect(pvc).NotTo(gomega.BeNil()) gomega.Expect(pvc).NotTo(gomega.BeNil())
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

3
test/e2e/storage/flexvolume_online_resize.go
View File

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

3
test/e2e/storage/mounted_volume_resize.go
View File

@ -131,8 +131,9 @@ var _ = utils.SIGDescribe("Mounted volume expand", func() {
ginkgo.By("Expanding current pvc") ginkgo.By("Expanding current pvc")
newSize := resource.MustParse("6Gi") 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") framework.ExpectNoError(err, "While updating pvc for more size")
pvc = newPVC
gomega.Expect(pvc).NotTo(gomega.BeNil()) gomega.Expect(pvc).NotTo(gomega.BeNil())
pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]

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

@ -146,7 +146,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
newSize := currentPvcSize.DeepCopy() newSize := currentPvcSize.DeepCopy()
newSize.Add(resource.MustParse("1Gi")) newSize.Add(resource.MustParse("1Gi"))
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize) 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") framework.ExpectError(err, "While updating non-expandable PVC")
}) })
} else { } else {
@ -173,8 +173,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
newSize := currentPvcSize.DeepCopy() newSize := currentPvcSize.DeepCopy()
newSize.Add(resource.MustParse("1Gi")) newSize.Add(resource.MustParse("1Gi"))
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize) 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") framework.ExpectNoError(err, "While updating pvc for more size")
l.resource.pvc = newPVC
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil()) gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage] 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 := currentPvcSize.DeepCopy()
newSize.Add(resource.MustParse("1Gi")) newSize.Add(resource.MustParse("1Gi"))
e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize) 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") framework.ExpectNoError(err, "While updating pvc for more size")
l.resource.pvc = newPVC
gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil()) gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil())
pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage] pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage]