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

Changed according to the review

reviewable/pr1235/r2
keglevich3 2016-09-22 10:55:16 +03:00 committed by GitHub
parent d99af82c5f
commit 6446dfe2e8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/user-guide/node-selection/index.md
View File

@ -67,8 +67,7 @@ met, the pod will still continue to run on the node. In the future we plan to of
`requiredDuringSchedulingRequiredDuringExecution` which will be just like `requiredDuringSchedulingIgnoredDuringExecution`
except that it will evict pods from nodes that cease to satisfy the pods' node affinity requirements.
Node affinity is currently expressed using an annotation on Pod. In v1.4 it will use a field, and we will
also introduce the second piece of the affinity mechanism, called pod affinity,
Node affinity is currently expressed using an annotation on Pod. After the release of 1.4, node affinity will use a field, and it will introduce an additional option for affinity called "pod affinity",
which allows you to control whether a pod schedules onto a particular node based on which other pods are
running on the node, rather than the labels on the node.