From 68334c002516141153f48278dc5e69ce0d2dbaa5 Mon Sep 17 00:00:00 2001 From: Mayank Kumar Date: Mon, 19 Sep 2016 01:07:05 -0700 Subject: [PATCH] fix minor documentation issues --- docs/user-guide/kubectl/kubectl_drain.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/kubectl/kubectl_drain.md b/docs/user-guide/kubectl/kubectl_drain.md index 535b6e024d..53de9f5844 100644 --- a/docs/user-guide/kubectl/kubectl_drain.md +++ b/docs/user-guide/kubectl/kubectl_drain.md @@ -11,13 +11,13 @@ 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. -Then drain deletes all pods except mirror pods (which cannot be deleted through +The `drain` deletes all pods except mirror pods (which cannot be deleted through the API server). If there are DaemonSet-managed pods, drain will not proceed without --ignore-daemonsets, and regardless it will not delete any DaemonSet-managed pods, because those pods would be immediately replaced by the DaemonSet controller, which ignores unschedulable markings. If there are any -pods that are neither mirror pods nor managed--by ReplicationController, -ReplicaSet, DaemonSet or Job--, then drain will not delete any pods unless you +pods that are neither mirror pods nor managed by ReplicationController, +ReplicaSet, DaemonSet or Job, then drain will not delete any pods unless you use --force. When you are ready to put the node back into service, use kubectl uncordon, which