github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38734 from bprashanth/ing_cleanup_timeout

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38689, 38743, 38734, 38430)

Temporarily bump e2e cleanup timeout
This commit is contained in:
Kubernetes Submit Queue
2016-12-13 21:25:35 -08:00
committed by GitHub
parent 7b8ecda289 f898bc5ecf
commit f55fc7a9e3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/ingress.go
View File

@@ -43,7 +43,8 @@ const (
cloudResourcePollTimeout = 5 * time.Minute
// Time required by the loadbalancer to cleanup, proportional to numApps/Ing.
lbCleanupTimeout = 5 * time.Minute
// Bring the cleanup timeout back down to 5m once b/33588344 is resolved.
lbCleanupTimeout = 15 * time.Minute
lbPollInterval = 30 * time.Second
// Name of the config-map and key the ingress controller stores its uid in.