Drain pods created from ReplicaSets

docs/man/man1/kubectl-drain.1

@@ -23,7 +23,8 @@ 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,
-DaemonSet or Job\-\-, then drain will not delete any pods unless you use \-\-force.
+ReplicaSet, DaemonSet or Job\-\-, then drain will not delete any pods unless you
+use \-\-force.
 
 .PP
 When you are ready to put the node back into service, use kubectl uncordon, which
@@ -33,7 +34,7 @@ will make the node schedulable again.
 .SH OPTIONS
 .PP
 \fB\-\-force\fP=false
-    Continue even if there are pods not managed by a ReplicationController, Job, or DaemonSet.
+    Continue even if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet.
 
 .PP
 \fB\-\-grace\-period\fP=\-1
@@ -147,10 +148,10 @@ will make the node schedulable again.
 .RS
 
 .nf
-# Drain node "foo", even if there are pods not managed by a ReplicationController, Job, or DaemonSet on it.
+# Drain node "foo", even if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet on it.
 $ kubectl drain foo \-\-force
 
-# As above, but abort if there are pods not managed by a ReplicationController, Job, or DaemonSet, and use a grace period of 15 minutes.
+# As above, but abort if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet, and use a grace period of 15 minutes.
 $ kubectl drain foo \-\-grace\-period=900
 
 

docs/user-guide/kubectl/kubectl_drain.md

@@ -48,7 +48,8 @@ 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,
-DaemonSet or Job--, then drain will not delete any pods unless you use --force.
+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
 will make the node schedulable again.
@@ -61,10 +62,10 @@ kubectl drain NODE
 ### Examples
 
 ```
-# Drain node "foo", even if there are pods not managed by a ReplicationController, Job, or DaemonSet on it.
+# Drain node "foo", even if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet on it.
 $ kubectl drain foo --force
 
-# As above, but abort if there are pods not managed by a ReplicationController, Job, or DaemonSet, and use a grace period of 15 minutes.
+# As above, but abort if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet, and use a grace period of 15 minutes.
 $ kubectl drain foo --grace-period=900
 
 ```
@@ -72,7 +73,7 @@ $ kubectl drain foo --grace-period=900
 ### Options
 
 ```
-      --force[=false]: Continue even if there are pods not managed by a ReplicationController, Job, or DaemonSet.
+      --force[=false]: Continue even if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet.
       --grace-period=-1: Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used.
       --ignore-daemonsets[=false]: Ignore DaemonSet-managed pods.
 ```
@@ -109,7 +110,7 @@ $ kubectl drain foo --grace-period=900
 
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra on 5-Apr-2016
+###### Auto generated by spf13/cobra on 15-Apr-2016
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_drain.md?pixel)]()

docs/yaml/kubectl/kubectl_drain.yaml

@@ -10,7 +10,8 @@ description: |
   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,
-  DaemonSet or Job--, then drain will not delete any pods unless you use --force.
+  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
   will make the node schedulable again.
@@ -18,7 +19,7 @@ options:
 - name: force
   default_value: "false"
   usage: |
-    Continue even if there are pods not managed by a ReplicationController, Job, or DaemonSet.
+    Continue even if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet.
 - name: grace-period
   default_value: "-1"
   usage: |
@@ -88,10 +89,10 @@ inherited_options:
   usage: |
     comma-separated list of pattern=N settings for file-filtered logging
 example: |
-  # Drain node "foo", even if there are pods not managed by a ReplicationController, Job, or DaemonSet on it.
+  # Drain node "foo", even if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet on it.
   $ kubectl drain foo --force
 
-  # As above, but abort if there are pods not managed by a ReplicationController, Job, or DaemonSet, and use a grace period of 15 minutes.
+  # As above, but abort if there are pods not managed by a ReplicationController, ReplicaSet, Job, or DaemonSet, and use a grace period of 15 minutes.
   $ kubectl drain foo --grace-period=900
 see_also:
 - kubectl