Merge pull request #5048 from tengqm/taint-and-toleration

Improve taint and toleration documentation
This commit is contained in:
Andrew Chen
2017-08-28 12:26:29 -07:00
committed by GitHub
11 changed files with 271 additions and 237 deletions
@@ -118,4 +118,5 @@ spec:
**Note**: a pod with the _unsafe_ sysctls specified above will fail to launch on
any node which has not enabled those two _unsafe_ sysctls explicitly. As with
_node-level_ sysctls it is recommended to use [_taints and toleration_
feature](/docs/user-guide/kubectl/v1.6/#taint) or [labels on nodes](/docs/concepts/configuration/assign-pod-node/) to schedule those pods onto the right nodes.
feature](/docs/user-guide/kubectl/v1.6/#taint) or [taints on nodes](/docs/concepts/configuration/taint-and-toleration/)
to schedule those pods onto the right nodes.