Skip to content

K
k3s
Commit b56252e3 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #23161 from thockin/drain-help-typo

Auto commit by PR queue bot
parents b9b3b5eb 1e5ce735
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
docs/man/man1/kubectl-drain.1
View file @ b56252e3
...@@ -21,7 +21,7 @@ Then drain deletes all pods except mirror pods (which cannot be deleted through ...@@ -21,7 +21,7 @@ Then 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 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
DaemonSet\-managed pods, because those pods would be immediately replaced by the DaemonSet\-managed pods, because those pods would be immediately replaced by the
DaemonSet controller, which ignores unschedulable marknigs. If there are any DaemonSet controller, which ignores unschedulable markings. If there are any
pods that are neither mirror pods nor managed\-\-by ReplicationController, pods that are neither mirror pods nor managed\-\-by ReplicationController,
DaemonSet or Job\-\-, then drain will not delete any pods unless you use \-\-force. DaemonSet or Job\-\-, then drain will not delete any pods unless you use \-\-force.
......
docs/user-guide/kubectl/kubectl_drain.md
View file @ b56252e3
...@@ -46,7 +46,7 @@ Then drain deletes all pods except mirror pods (which cannot be deleted through ...@@ -46,7 +46,7 @@ Then 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 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
DaemonSet-managed pods, because those pods would be immediately replaced by the DaemonSet-managed pods, because those pods would be immediately replaced by the
DaemonSet controller, which ignores unschedulable marknigs. If there are any DaemonSet controller, which ignores unschedulable markings. If there are any
pods that are neither mirror pods nor managed--by ReplicationController, pods that are neither mirror pods nor managed--by ReplicationController,
DaemonSet or Job--, then drain will not delete any pods unless you use --force. DaemonSet or Job--, then drain will not delete any pods unless you use --force.
......
pkg/kubectl/cmd/drain.go
View file @ b56252e3
...@@ -103,7 +103,7 @@ Then drain deletes all pods except mirror pods (which cannot be deleted through ...@@ -103,7 +103,7 @@ Then 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 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
DaemonSet-managed pods, because those pods would be immediately replaced by the DaemonSet-managed pods, because those pods would be immediately replaced by the
DaemonSet controller, which ignores unschedulable marknigs. If there are any DaemonSet controller, which ignores unschedulable markings. If there are any
pods that are neither mirror pods nor managed--by ReplicationController, pods that are neither mirror pods nor managed--by ReplicationController,
DaemonSet or Job--, then drain will not delete any pods unless you use --force. DaemonSet or Job--, then drain will not delete any pods unless you use --force.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment