whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-authentication-md-syntax

Browse Source
This commit is contained in:
Jared
2016-12-07 17:31:21 -08:00
committed by GitHub
parent 97eaed987c 9ea5ebbc6f
commit fdac9a62b0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/rescheduler.md
+2
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"}]`