From e7633d83285500ebe5fa5b2e41468fecfb7be24d Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Mon, 26 Sep 2016 15:27:49 -0700 Subject: [PATCH] nodefs becomes imagefs on GCI since kubelet cannot identify rootfs correctly Signed-off-by: Vishnu kannan --- cluster/gce/config-default.sh | 7 ++++++- cluster/gce/config-test.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index d270f6af598..f5214fed6bc 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 aa3c419f43b..321583ebf17 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:-}"