Merge pull request #1235 from keglevich3/patch-3

This feature wasn't ready in 1.3V
This commit is contained in:
devin-donnelly
2016-09-26 10:34:06 -07:00
committed by GitHub
+1 -2
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.3 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.