github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70278 from jhvhs/master 

Documentation re-formatting
pull/58/head
k8s-ci-robot 2018-10-26 13:32:00 -07:00 committed by GitHub
parent 5e45a10351 84ba7e8f69
commit 117c6177c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/drain/drain.go
View File

@ -160,9 +160,9 @@ var (
Drain node in preparation for maintenance. Drain node in preparation for maintenance.
The given node will be marked unschedulable to prevent new pods from arriving. The given node will be marked unschedulable to prevent new pods from arriving.
'drain' evicts the pods if the APIServer supports eviction 'drain' evicts the pods if the APIServer supports
(http://kubernetes.io/docs/admin/disruptions/). Otherwise, it will use normal DELETE [eviction](http://kubernetes.io/docs/admin/disruptions/). Otherwise, it will use normal
to delete the pods. DELETE to delete the pods.
The 'drain' evicts or deletes all pods except mirror pods (which cannot be deleted through The 'drain' evicts or deletes all pods except mirror pods (which cannot be deleted through
the API server). If there are DaemonSet-managed pods, drain will not proceed the API server). If there are DaemonSet-managed pods, drain will not proceed
without --ignore-daemonsets, and regardless it will not delete any without --ignore-daemonsets, and regardless it will not delete any