whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'release-1.6' and 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

Browse Source 
* 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io:
  Update daemons.md

* 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io:
  Update daemons.md
This commit is contained in:
Andrew Chen
2017-03-22 13:39:50 -07:00
parent 31221c3a76 50dc7445d9
commit 27d6822bb6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/daemons.md
+2 -2
View File
@@ -126,9 +126,9 @@ the new DaemonSet with the different template will recognize all the existing po
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.
Starting from Kubernetes version 1.6, you can [perform a rolling update](/docs/tasks/manage-daemon/update-daemon-set/) on a DaemonSet.
In Kubernetes version 1.6 and later, you can [perform a rolling update](/docs/tasks/manage-daemon/update-daemon-set/) on a DaemonSet.
Support for updating DaemonSets and controlled updating of nodes is planned.
Future releases of Kubernetes will support controlled updating of nodes.
## Alternatives to DaemonSet