Merge pull request kubernetes#93119 from dcbw/e2e-ingress-misisng-return

k8s-ci-robot · web-flow · commit a789d56b65d3 · 2020-07-18T13:58:49.000-07:00
test/e2e/ingress: add missing return to fix panics on !GCE
diff --git a/test/e2e/network/ingress.go b/test/e2e/network/ingress.go
@@ -623,10 +623,10 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
 			}
 			if jig.Ingress == nil {
 				ginkgo.By("No ingress created, no cleanup necessary")
-			} else {
-				ginkgo.By("Deleting ingress")
-				jig.TryDeleteIngress()
+				return
 			}
+			ginkgo.By("Deleting ingress")
+			jig.TryDeleteIngress()
 
 			ginkgo.By("Cleaning up cloud resources")
 			err := gceController.CleanupIngressController()

Original file line number	Diff line number	Diff line change
`@@ -623,10 +623,10 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {`
`623`	`623`	`}`
`624`	`624`	`if jig.Ingress == nil {`
`625`	`625`	`ginkgo.By("No ingress created, no cleanup necessary")`
`626`		`- } else {`
`627`		`- ginkgo.By("Deleting ingress")`
`628`		`- jig.TryDeleteIngress()`
	`626`	`+ return`
`629`	`627`	`}`
	`628`	`+ ginkgo.By("Deleting ingress")`
	`629`	`+ jig.TryDeleteIngress()`
`630`	`630`
`631`	`631`	`ginkgo.By("Cleaning up cloud resources")`
`632`	`632`	`err := gceController.CleanupIngressController()`