From 4f35b31fc74a12a39615c13f5aedf1e18ddf07b4 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Mon, 13 Mar 2017 00:37:04 -0400
Subject: [PATCH] Try speeding up ConfigMap e2e namespace deletion

---
 test/e2e/common/configmap.go         | 8 ++++++--
 test/e2e/common/docker_containers.go | 4 +++-
 test/utils/runners.go                | 6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go
index 400a1644eb6..58421952c2c 100644
--- a/test/e2e/common/configmap.go
+++ b/test/e2e/common/configmap.go
@@ -539,6 +539,7 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d
 		framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
 	}
 
+	one := int64(1)
 	pod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "pod-configmaps-" + string(uuid.NewUUID()),
@@ -572,7 +573,8 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d
 					},
 				},
 			},
-			RestartPolicy: v1.RestartPolicyNever,
+			RestartPolicy:                 v1.RestartPolicyNever,
+			TerminationGracePeriodSeconds: &one,
 		},
 	}
 
@@ -617,6 +619,7 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item
 		framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
 	}
 
+	one := int64(1)
 	pod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "pod-configmaps-" + string(uuid.NewUUID()),
@@ -656,7 +659,8 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item
 					},
 				},
 			},
-			RestartPolicy: v1.RestartPolicyNever,
+			RestartPolicy:                 v1.RestartPolicyNever,
+			TerminationGracePeriodSeconds: &one,
 		},
 	}
 
diff --git a/test/e2e/common/docker_containers.go b/test/e2e/common/docker_containers.go
index f012a2e2ca5..c0434300403 100644
--- a/test/e2e/common/docker_containers.go
+++ b/test/e2e/common/docker_containers.go
@@ -71,6 +71,7 @@ const testContainerName = "test-container"
 func entrypointTestPod() *v1.Pod {
 	podName := "client-containers-" + string(uuid.NewUUID())
 
+	one := int64(1)
 	return &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: podName,
@@ -82,7 +83,8 @@ func entrypointTestPod() *v1.Pod {
 					Image: "gcr.io/google_containers/eptest:0.1",
 				},
 			},
-			RestartPolicy: v1.RestartPolicyNever,
+			RestartPolicy:                 v1.RestartPolicyNever,
+			TerminationGracePeriodSeconds: &one,
 		},
 	}
 }
diff --git a/test/utils/runners.go b/test/utils/runners.go
index e96c76c0a84..c1cdb21a2d5 100644
--- a/test/utils/runners.go
+++ b/test/utils/runners.go
@@ -494,6 +494,7 @@ func (config *RCConfig) create() error {
 	if config.DNSPolicy == nil {
 		config.DNSPolicy = &dnsDefault
 	}
+	one := int64(1)
 	rc := &v1.ReplicationController{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: config.Name,
@@ -517,8 +518,9 @@ func (config *RCConfig) create() error {
 							ReadinessProbe: config.ReadinessProbe,
 						},
 					},
-					DNSPolicy:    *config.DNSPolicy,
-					NodeSelector: config.NodeSelector,
+					DNSPolicy:                     *config.DNSPolicy,
+					NodeSelector:                  config.NodeSelector,
+					TerminationGracePeriodSeconds: &one,
 				},
 			},
 		},