scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vish Kannan
2016-09-15 19:28:59 -07:00
committed by GitHub
parent 0d8db69660
commit 492ca3bc9c
10 changed files with 109 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/design/resource-qos.md
View File

@@ -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.

2
docs/proposals/kubelet-systemd.md
View File

@@ -365,7 +365,7 @@ The `kubelet` will set the following:
The `kubelet` at bootstrapping will set the `oom_score_adj` value for Kubernetes
daemons, and any dependent container-runtime daemons.
If `container-runtime` is set to `docker`, then set its `oom_score_adj=-999`
If `container-runtime` is set to `docker`, then set its `oom_score_adj=-900`
## Implementation concerns