kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1862 from lkysow/patch-1 

Add newline to markdown so bullets show up properly
pull/1881/head^2
Jared 2016-12-07 17:25:22 -08:00 committed by GitHub
parent ba376bee10 7aee1d8528
commit 9ea5ebbc6f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/rescheduler.md
View File

@ -43,6 +43,7 @@ killed for this purpose.
Rescheduler doesn't have any user facing configuration (component config) or API. Rescheduler doesn't have any user facing configuration (component config) or API.
It's enabled by default. It can be disabled: It's enabled by default. It can be disabled:
* during cluster setup by setting `ENABLE_RESCHEDULER` flag to `false` * during cluster setup by setting `ENABLE_RESCHEDULER` flag to `false`
* on running cluster by deleting its manifest from master node * on running cluster by deleting its manifest from master node
(default path `/etc/kubernetes/manifests/rescheduler.manifest`) (default path `/etc/kubernetes/manifests/rescheduler.manifest`)
@ -51,6 +52,7 @@ It's enabled by default. It can be disabled:
To be critical an add-on has to run in `kube-system` namespace (cofigurable via flag) To be critical an add-on has to run in `kube-system` namespace (cofigurable via flag)
and have the following annotations specified: and have the following annotations specified:
* `scheduler.alpha.kubernetes.io/critical-pod` set to empty string * `scheduler.alpha.kubernetes.io/critical-pod` set to empty string
* `scheduler.alpha.kubernetes.io/tolerations` set to `[{"key":"CriticalAddonsOnly", "operator":"Exists"}]` * `scheduler.alpha.kubernetes.io/tolerations` set to `[{"key":"CriticalAddonsOnly", "operator":"Exists"}]`