From 691f8667c67628eba5545a9a8b466612b462517b Mon Sep 17 00:00:00 2001 From: jqmichael Date: Sat, 9 May 2020 18:40:18 -0700 Subject: [PATCH] Clarify node affinity in ScheduleDaemonSetPods > If node affinity of the DaemonSet pod already exists, it is replaced. The original statement made it sound like the original node affinity was ignored when selecting the target node. Added clarification it is not the case. For reference, the DaemonSet controller behavior. https://github.com/kubernetes/kubernetes/blob/master/pkg/controller/daemon/daemon_controller.go#L1194 --- content/en/docs/concepts/workloads/controllers/daemonset.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/concepts/workloads/controllers/daemonset.md b/content/en/docs/concepts/workloads/controllers/daemonset.md index f2feb36515..bb6c0d7f2c 100644 --- a/content/en/docs/concepts/workloads/controllers/daemonset.md +++ b/content/en/docs/concepts/workloads/controllers/daemonset.md @@ -125,7 +125,7 @@ That introduces the following issues: scheduler instead of the DaemonSet controller, by adding the `NodeAffinity` term to the DaemonSet pods, instead of the `.spec.nodeName` term. The default scheduler is then used to bind the pod to the target host. If node affinity of -the DaemonSet pod already exists, it is replaced. The DaemonSet controller only +the DaemonSet pod already exists, it is replaced (the original node affinity was taken into account before selecting the target host). The DaemonSet controller only performs these operations when creating or modifying DaemonSet pods, and no changes are made to the `spec.template` of the DaemonSet.