From 6446dfe2e8048162fab93f6c44d9da13b8fb5b85 Mon Sep 17 00:00:00 2001 From: keglevich3 Date: Thu, 22 Sep 2016 10:55:16 +0300 Subject: [PATCH] Changed according to the review --- docs/user-guide/node-selection/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/user-guide/node-selection/index.md b/docs/user-guide/node-selection/index.md index b743948612..bce615ad74 100644 --- a/docs/user-guide/node-selection/index.md +++ b/docs/user-guide/node-selection/index.md @@ -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.