From 10f73bde27182bfb478c76b54bdb3dd258c63ac8 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Fri, 18 Nov 2016 08:48:40 -0800 Subject: [PATCH] added eviction minimum reclaim flags to test flags, and changed gce default config for eviction-hard to match what tests are using --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- test/e2e_node/services/kubelet.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 01d862e9654..aa9c698f04d 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -165,7 +165,7 @@ HAIRPIN_MODE="${HAIRPIN_MODE:-promiscuous-bridge}" # promiscuous-bridge, hairpin E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} # Evict pods whenever compute resource availability on the nodes gets below a threshold. -EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}" +EVICTION_HARD="${EVICTION_HARD:-memory.available<250Mi,nodefs.available<10%,nodefs.inodesFree<5%}" # Optional: custom scheduling algorithm SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index c44989bd76c..a953ae1cfa0 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -202,7 +202,7 @@ E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} PREPULL_E2E_IMAGES="${PREPULL_E2E_IMAGES:-true}" # Evict pods whenever compute resource availability on the nodes gets below a threshold. -EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}" +EVICTION_HARD="${EVICTION_HARD:-memory.available<250Mi,nodefs.available<10%,nodefs.inodesFree<5%}" # Optional: custom scheduling algorithm SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}" diff --git a/test/e2e_node/services/kubelet.go b/test/e2e_node/services/kubelet.go index 6d9fada01e2..5ea5b633243 100644 --- a/test/e2e_node/services/kubelet.go +++ b/test/e2e_node/services/kubelet.go @@ -123,6 +123,7 @@ func (e *E2EServices) startKubelet() (*server, error) { // by kubelet-flags. "--feature-gates", framework.TestContext.FeatureGates, "--eviction-hard", "memory.available<250Mi,nodefs.available<10%,nodefs.inodesFree<5%", // The hard eviction thresholds. + "--eviction-minimum-reclaim", "nodefs.available=5%,nodefs.inodesFree=5%", // The minimum reclaimed resources after eviction. "--v", LOG_VERBOSITY_LEVEL, "--logtostderr", ) // Enable kubenet by default.