Merge pull request #43018 from nicksardo/ingress-upgrade-cleanup-flake

Automatic merge from submit-queue (batch tested with PRs 43018, 42713) Log instead of fail on GLBCs tendency to leak resources **What this PR does / why we need it**: Stops upgrade tests from flaking because the GLBC does not cleanup all resources due to a race condition. **Which issue this PR fixes**: fixes #38569 **Special notes for your reviewer**: To be reviewed by @mml ```release-note NONE ```

Merge pull request #43018 from nicksardo/ingress-upgrade-cleanup-flake
1221779b · Kubernetes Submit Queue · GitHub · 442e9200 · 3e85c0f7 · 1221779b
Commit 1221779b authored Mar 14, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ingress_utils.go test/e2e/framework/ingress_utils.go +3 -2

No files found.
--- a/test/e2e/framework/ingress_utils.go
+++ b/test/e2e/framework/ingress_utils.go
@@ -366,9 +366,10 @@ func CleanupGCEIngressController(gceController *GCEIngressController) {
 		By(fmt.Sprintf("WARNING: possibly leaked static IP: %v\n", ipErr))
 	}

-	// Fail if the controller didn't cleanup
+	// Logging that the GLBC failed to cleanup GCE resources on ingress deletion
+	// See kubernetes/ingress#431
 	if pollErr != nil {
-		Failf("L7 controller failed to delete all cloud resources on time. %v", pollErr)
+		Logf("error: L7 controller failed to delete all cloud resources on time. %v", pollErr)
 	}
 }