Merge pull request #32114 from wojtek-t/fix_high_density_kubemark

Automatic merge from submit-queue

Increase timeout for pods GC in tests

Fix "kubernetes-kubemark-high-density-100-gce" suite
This commit is contained in:
Kubernetes Submit Queue 2016-09-06 03:51:30 -07:00 committed by GitHub
commit 08f49bff76

View File

@ -3368,6 +3368,8 @@ func DeleteRCAndWaitForGC(c *client.Client, ns, name string) error {
timeout = 10 * time.Minute
} else {
timeout = time.Duration(rc.Spec.Replicas/gcThroughput) * time.Second
// gcThroughput is pretty strict now, add a bit more to it
timeout = timeout + 3*time.Minute
}
err = waitForPodsInactive(ps, interval, timeout)
if err != nil {