From cda68cbeb5a2c35e13eb9548576cdbdb57022092 Mon Sep 17 00:00:00 2001 From: Marek Grabowski Date: Tue, 15 Sep 2015 17:55:37 -0400 Subject: [PATCH] Revert "Lower the grace period for Pod eviction for e2e clusters" --- cluster/gce/config-test.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 1ca394370d2..ef6ffa6f44a 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -62,10 +62,7 @@ TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}" KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL" APISERVER_TEST_ARGS="--runtime-config=experimental/v1 ${TEST_CLUSTER_LOG_LEVEL}" -# pod-eviction-timeout is currently 2 * node-monitor-grace-period to allow for some network -# problems, but don't ensure that the Kubelet can be restarted without evicting Pods. We don't -# think it's necessary for tests. -CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL} --pod-eviction-timeout=1m20s" +CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}"