Merge pull request #7879 from ahardin-rh/PR5709-ENT-36

[enterprise-3.6] PR#5709 CP and Revision History

Author: ahardin-rh

admin_guide/manage_nodes.adoc

@@ -241,31 +241,49 @@ controller] can be evacuated; the replication controllers create new pods on
 other nodes and remove the existing pods from the specified node(s). Bare pods,
 meaning those not backed by a replication controller, are unaffected by default.
 
-To list pods that will be migrated without actually performing the evacuation,
-use the `--dry-run` option:
+To evacuate one or more nodes:
 
 ----
-$ oc adm manage-node <node1> <node2> \
-    --evacuate --dry-run [--pod-selector=<pod_selector>]
+$ oc adm drain <node1> <node2>
 ----
 
-To actually evacuate all or selected pods on one or more nodes:
+You can force deletion of bare pods by using the `--force` option. When set to
+`true`, deletion continues even if there are pods not managed by a replication
+controller, ReplicaSet, job, daemonset, or StatefulSet:
 
 ----
-$ oc adm manage-node <node1> <node2> \
-    --evacuate [--pod-selector=<pod_selector>]
+$ oc adm drain <node1> <node2> --force=true
 ----
 
-You can force deletion of bare pods by using the `--force` option:
+You can use `--grace-period` to set a period of time in seconds for each pod to
+terminate gracefully. If negative, the default value specified in the pod will
+be used:
 
 ----
-$ oc adm manage-node <node1> <node2> \
-    --evacuate --force [--pod-selector=<pod_selector>]
+$ oc adm drain <node1> <node2> --grace-period=-1
 ----
 
-Alternatively, instead of specifying specific node names (e.g., `<node1>
-<node2>`), you can use the `--selector=<node_selector>` option to evacuate pods
-on selected nodes.
+You can use `--ignore-daemonsets` and set it to `true` to ignore
+daemonset-managed pods:
+
+----
+$ oc adm drain <node1> <node2> --ignore-daemonset=true
+----
+
+You can use `--timeout` to set the length of time to wait before giving up. A
+value of `0` sets an infinite length of time:
+
+----
+$ oc adm drain <node1> <node2> --timeout=5s
+----
+
+You can use `--delete-local-data` and set it to `true` to continue deletion even
+if there are pods using emptyDir (local data that will be deleted when the node
+is drained):
+
+----
+$ oc adm drain <node1> <node2> --delete-local-data=true
+----
 
 [[rebooting-nodes]]
 == Rebooting Nodes

admin_guide/revhistory_admin_guide.adoc

@@ -7,6 +7,21 @@
 :experimental:
 
 // do-release: revhist-tables
+as
+== Tues Feb 20 2018
+
+// tag::admin_guide_tues_feb_20_2018[]
+[cols="1,3",options="header"]
+|===
+
+|Affected Topic |Description of Change
+//Tues Feb 20 2018
+n|xref:../admin_guide/manage_nodes.adoc#admin-guide-manage-nodes[Managing Nodes]
+|Replaced outdated `oadm manage-node --evacuate` commands with xref:../admin_guide/manage_nodes.adoc#evacuating-pods-on-nodes[`oc adm drain` commands].
+|===
+
+// end::admin_guide_tues_feb_20_2018[]]
+
 == Fri Feb 16 2018
 
 // tag::admin_guide_fri_feb_16_2018[]
@@ -18,7 +33,7 @@
 n|xref:../admin_guide/service_accounts.adoc#admin-sa-user-names-and-groups[Service Accounts]
 | Changed `serviceaccounts` to `serviceaccount` in the xref:../service_accounts.adoc#admin-sa-user-names-and-groups[User Names and Groups] section.
 
-|xref:../admin_guide/manage_nodes.adoc#admin-guide-manage-nodes[Manging Nodes]
+|xref:../admin_guide/manage_nodes.adoc#admin-guide-manage-nodes[Managing Nodes]
 |Added new section on xref:../admin_guide/manage_nodes.adoc#managing-nodes-docker-reset[Resetting Docker Storage] to free up space on nodes.
 
 |xref:../admin_guide/managing_networking.adoc#admin-guide-manage-networking[Managing Networking]

welcome/revhistory_full.adoc

@@ -10,6 +10,11 @@ The following sections aggregate the revision histories of each guide by publish
 date.
 
 // do-release: revhist-tables
+
+== Tues Feb 20 2018
+.Cluster Administration
+include::admin_guide/revhistory_admin_guide.adoc[tag=admin_guide_tues_feb_20_2018]
+
 == Fri Feb 16 2018
 .Scaling Performance
 include::scaling_performance/revhistory_scaling_performance.adoc[tag=scaling_performance_fri_feb_16_2018]