From d7e0faefcf4fc1ddd2b427881fb85c55d36b1290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Wed, 20 Jul 2016 15:09:57 +0200 Subject: [PATCH] Update DaemonSet docs about node affinity After merging kubernetes/kubernetes#28803 DaemonSets can also be scheduled using node affinity. --- docs/admin/daemons.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/admin/daemons.md b/docs/admin/daemons.md index f2b5463e8d..2e50d8ef9b 100644 --- a/docs/admin/daemons.md +++ b/docs/admin/daemons.md @@ -71,9 +71,11 @@ a node for testing. If you specify a `.spec.template.spec.nodeSelector`, then the DaemonSet controller will create pods on nodes which match that [node -selector](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/node-selection). +selector](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/node-selection). +If you specify a `scheduler.alpha.kubernetes.io/affinity` annotation in `.spec.template.metadata.annotations`, +then DaemonSet controller will create pods on nodes which match that [node affinity](../../user-guide/node-selection/#alpha-feature-in-kubernetes-v12-node-affinity). -If you do not specify a `.spec.template.spec.nodeSelector`, then the DaemonSet controller will +If you do not specify a `.spec.template.spec.nodeSelector` nor `node affinity`, then the DaemonSet controller will create pods on all nodes. ## How Daemon Pods are Scheduled