scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue
2017-03-14 15:59:18 -07:00
committed by GitHub
parent 442e920085 3e85c0f758
commit 1221779b18
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/ingress_utils.go
View File

@@ -366,9 +366,10 @@ func CleanupGCEIngressController(gceController *GCEIngressController) {
By(fmt.Sprintf("WARNING: possibly leaked static IP: %v\n", ipErr)) 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 { 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)
} }
} }