Merge pull request #47479 from mikedanese/double-timeout

Automatic merge from submit-queue (batch tested with PRs 47073, 47457, 47479) double ns deletion timeout Overnight for monitoring. Ref https://github.com/kubernetes/kubernetes/issues/47135

Merge pull request #47479 from mikedanese/double-timeout
ae8258d3 · Kubernetes Submit Queue · GitHub · be0a5f75 · eb32d6b5 · ae8258d3
Commit ae8258d3 authored Jun 14, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

framework.go test/e2e/framework/framework.go +4 -2

No files found.
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -51,8 +51,10 @@ import (
 )

 const (
-	maxKubectlExecRetries           = 5
-	DefaultNamespaceDeletionTimeout = 5 * time.Minute
+	maxKubectlExecRetries = 5
+	// TODO(mikedanese): reset this to 5 minutes once #47135 is resolved.
+	// ref https://github.com/kubernetes/kubernetes/issues/47135
+	DefaultNamespaceDeletionTimeout = 10 * time.Minute
 )

 // Framework supports common operations used by e2e tests; it will keep a client & a namespace for you.