Merge pull request #38734 from bprashanth/ing_cleanup_timeout

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
commit f55fc7a9e3

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.