From 2ded739ec17e0c2ddc00ec749b5589e75b00bd58 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Thu, 12 Sep 2019 11:02:28 -0600 Subject: [PATCH] Update DaemonSet deletion documentation (#16235) * Update DaemonSet deletion documentation The "Updating a DaemonSet" section referred to pre-1.6 behavior, where rolling updates of DaemonSets were not supported and thus orphaned pods from deleted DaemonSets would not be replaced by a new DaemonSet. Describe the new behavior, where orphaned pods can be adopted by a new DaemonSet and may be replaced depending on the update strategy in use. * Tweak language around Pod replacement after DaemonSet deletion * Update note about DaemonSet rolling updates No need to call out the version in which rolling updates for DaemonSets were introduced given how long they've been supported. --- .../docs/concepts/workloads/controllers/daemonset.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/content/en/docs/concepts/workloads/controllers/daemonset.md b/content/en/docs/concepts/workloads/controllers/daemonset.md index 37b9fac0f3..62687e8cda 100644 --- a/content/en/docs/concepts/workloads/controllers/daemonset.md +++ b/content/en/docs/concepts/workloads/controllers/daemonset.md @@ -194,14 +194,12 @@ You can modify the Pods that a DaemonSet creates. However, Pods do not allow al fields to be updated. Also, the DaemonSet controller will use the original template the next time a node (even with the same name) is created. - You can delete a DaemonSet. If you specify `--cascade=false` with `kubectl`, then the Pods -will be left on the nodes. You can then create a new DaemonSet with a different template. -The new DaemonSet with the different template will recognize all the existing Pods as having -matching labels. It will not modify or delete them despite a mismatch in the Pod template. -You will need to force new Pod creation by deleting the Pod or deleting the node. +will be left on the nodes. If you subsequently create a new DaemonSet with the same selector, +the new DaemonSet adopts the existing Pods. If any Pods need replacing the DaemonSet replaces +them according to its `updateStrategy`. -In Kubernetes version 1.6 and later, you can [perform a rolling update](/docs/tasks/manage-daemon/update-daemon-set/) on a DaemonSet. +You can [perform a rolling update](/docs/tasks/manage-daemon/update-daemon-set/) on a DaemonSet. ## Alternatives to DaemonSet