Revert "Revert "[kubelet] Fix oom-score-adj policy in kubelet""

This commit is contained in:
Vish Kannan
2016-09-16 16:32:58 -07:00
committed by GitHub
parent af3050dd15
commit a1fe3adbc7
10 changed files with 300 additions and 111 deletions

View File

@@ -226,6 +226,7 @@ Pod OOM score configuration
*Pod infra containers* or *Special Pod init process*
- OOM_SCORE_ADJ: -998
*Kubelet, Docker*
- OOM_SCORE_ADJ: -999 (wont 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.