diff options
| author | Vish Kannan <vishh@users.noreply.github.com> | 2016-09-15 19:28:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 19:28:59 -0700 |
| commit | b31fe4fe236adba7209d13ff0eda96ea9805e14a (patch) | |
| tree | 22509bbcc40831901afec36d9419f9254cc38bc5 | |
| parent | 9bbb2c90567802b95cb6b2509fc73f16bc195136 (diff) | |
Revert "[kubelet] Fix oom-score-adj policy in kubelet"
| -rw-r--r-- | resource-qos.md | 1 |
1 files changed, 0 insertions, 1 deletions
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. |