diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 9a6bd478e82..dc46f667c86 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -162,7 +162,12 @@ 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%}" +# TODO: Get rid of the conditionals once https://github.com/kubernetes/kubernetes/issues/33444 is resolved. +if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then + EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}" +else + EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,imagefs.available<10%,imagefs.inodesFree<5%}" +fi # 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 4373606eb22..9f0391da024 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -197,7 +197,12 @@ 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%}" +# TODO: Get rid of the conditionals once https://github.com/kubernetes/kubernetes/issues/33444 is resolved. +if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then + EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}" +else + EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,imagefs.available<10%,imagefs.inodesFree<5%}" +fi # Optional: custom scheduling algorithm SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"