Skip to content

Commit

Permalink
Merge pull request kubernetes#43018 from nicksardo/ingress-upgrade-cl…
Browse files Browse the repository at this point in the history
…eanup-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 kubernetes#38569

**Special notes for your reviewer**:
To be reviewed by @mml 

```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue authored Mar 14, 2017
2 parents 442e920 + 3e85c0f commit 1221779
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions test/e2e/framework/ingress_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down

0 comments on commit 1221779

Please sign in to comment.