Skip to content

K
k3s
Commit 1221779b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents 442e9200 3e85c0f7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
test/e2e/framework/ingress_utils.go
View file @ 1221779b
...@@ -366,9 +366,10 @@ func CleanupGCEIngressController(gceController *GCEIngressController) { ...@@ -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)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment