Merge pull request #2905 from davidopp/release-1.6

Update docs to reflect affinity, taints, tolerations moving from alpha annotations to (beta) fields.
This commit is contained in:
devin-donnelly
2017-03-21 17:01:57 -07:00
committed by GitHub
3 changed files with 16 additions and 13 deletions
@@ -48,10 +48,8 @@ It's enabled by default. It can be disabled:
### Marking add-on as critical
To be critical an add-on has to run in `kube-system` namespace (configurable via flag)
and have the following annotations specified:
* `scheduler.alpha.kubernetes.io/critical-pod` set to empty string
* `scheduler.alpha.kubernetes.io/tolerations` set to `[{"key":"CriticalAddonsOnly", "operator":"Exists"}]`
To be critical an add-on has to run in `kube-system` namespace (configurable via flag) and
* have the `scheduler.alpha.kubernetes.io/critical-pod` annotation set to empty string, and
* have the PodSpec's `tolerations` field set to `[{"key":"CriticalAddonsOnly", "operator":"Exists"}]`
The first one marks a pod a critical. The second one is required by Rescheduler algorithm.