From 645c9153d43f8254fec8f796ce20c4234d2063f5 Mon Sep 17 00:00:00 2001 From: gmarek Date: Fri, 11 Sep 2015 12:52:39 -0400 Subject: [PATCH] Lower the grace period for Pod eviction for e2e clusters --- cluster/gce/config-test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index ef6ffa6f44a..1ca394370d2 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -62,7 +62,10 @@ 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}" -CONTROLLER_MANAGER_TEST_ARGS="${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" SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}" KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}"