Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 86c322e

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #33520 from vishh/33444
Automatic merge from submit-queue Nodefs becomes imagefs on GCI Kubelet cannot identify rootfs correctly For #33444 ```release-note Enforce Disk based pod eviction with GCI base image in Kubelet ``` Signed-off-by: Vishnu kannan <[email protected]>
2 parents c1d2b61 + e7633d8 commit 86c322e

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎cluster/gce/config-default.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,12 @@ HAIRPIN_MODE="${HAIRPIN_MODE:-promiscuous-bridge}" # promiscuous-bridge, hairpin
162162
E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
163163

164164
# Evict pods whenever compute resource availability on the nodes gets below a threshold.
165-
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}"
165+
# TODO: Get rid of the conditionals once https://github.com/kubernetes/kubernetes/issues/33444 is resolved.
166+
if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
167+
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}"
168+
else
169+
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,imagefs.available<10%,imagefs.inodesFree<5%}"
170+
fi
166171

167172
# Optional: custom scheduling algorithm
168173
SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"

‎cluster/gce/config-test.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,12 @@ E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
197197
PREPULL_E2E_IMAGES="${PREPULL_E2E_IMAGES:-true}"
198198

199199
# Evict pods whenever compute resource availability on the nodes gets below a threshold.
200-
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}"
200+
# TODO: Get rid of the conditionals once https://github.com/kubernetes/kubernetes/issues/33444 is resolved.
201+
if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
202+
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%}"
203+
else
204+
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi,imagefs.available<10%,imagefs.inodesFree<5%}"
205+
fi
201206

202207
# Optional: custom scheduling algorithm
203208
SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"

0 commit comments

Comments
 (0)