Merge pull request #59982 from MrHohn/pre-shared-cert-fix

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [e2e ingress-gce] Enhance cleanup logic for pre-shared-cert test **What this PR does / why we need it**: Pre-shared-cert test are flaky (https://k8s-testgrid.appspot.com/sig-network-gce#ingress-gce-e2e&width=5), mostly due to the orphaned ssl cert. This PR enhances the cleanup logic to continue deleting the orphaned cert for this case (without this test will panic on TryDeleteIngress if no ingress is created). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #NONE **Special notes for your reviewer**: /assign @rramkumar1 **Release note**: ```release-note NONE ```

Merge pull request #59982 from MrHohn/pre-shared-cert-fix
40889e74 · Kubernetes Submit Queue · GitHub · 8d02b2b3 · 0f7ee998 · 40889e74
Unverified Commit 40889e74 authored Feb 27, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

ingress.go test/e2e/network/ingress.go +3 -1

No files found.
--- a/test/e2e/network/ingress.go
+++ b/test/e2e/network/ingress.go
@@ -330,7 +330,9 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
 				// We would not be able to delete the cert until ingress controller
 				// cleans up the target proxy that references it.
 				By("Deleting ingress before deleting ssl certificate")
-				jig.TryDeleteIngress()
+				if jig.Ingress != nil {
+					jig.TryDeleteIngress()
+				}
 				By(fmt.Sprintf("Deleting ssl certificate %q on GCE", preSharedCertName))
 				err := wait.Poll(framework.LoadBalancerPollInterval, framework.LoadBalancerCleanupTimeout, func() (bool, error) {
 					if err := gceCloud.DeleteSslCertificate(preSharedCertName); err != nil && !errors.IsNotFound(err) {