From b31fe4fe236adba7209d13ff0eda96ea9805e14a Mon Sep 17 00:00:00 2001 From: Vish Kannan Date: Thu, 15 Sep 2016 19:28:59 -0700 Subject: Revert "[kubelet] Fix oom-score-adj policy in kubelet" --- resource-qos.md | 1 - 1 file changed, 1 deletion(-) diff --git a/resource-qos.md b/resource-qos.md index 6a8e8ab2..b2a43c97 100644 --- a/resource-qos.md +++ b/resource-qos.md @@ -226,7 +226,6 @@ Pod OOM score configuration *Pod infra containers* or *Special Pod init process* - OOM_SCORE_ADJ: -998 - *Kubelet, Docker* - OOM_SCORE_ADJ: -999 (won’t be OOM killed) - Hack, because these critical tasks might die if they conflict with guaranteed containers. In the future, we should place all user-pods into a separate cgroup, and set a limit on the memory they can consume. -- cgit v1.2.3