@@ -344,6 +344,12 @@ Manage nodes - list pods, evacuate, or mark ready

 	# Migrate selected pods

 	oadm manage-node <mynode> --evacuate --pod-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	oadm manage-node <mynode> --evacuate --grace-period=60 --pod-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	oadm manage-node <mynode> --evacuate --force --pod-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	oadm manage-node <mynode> --evacuate --dry-run --pod-selector="<service=myapp>"

@@ -344,6 +344,12 @@ Manage nodes - list pods, evacuate, or mark ready

 	# Migrate selected pods

 	oc adm manage-node <mynode> --evacuate --pod-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	oc adm manage-node <mynode> --evacuate --grace-period=60 --pod-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	oc adm manage-node <mynode> --evacuate --force --pod-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	oc adm manage-node <mynode> --evacuate --dry-run --pod-selector="<service=myapp>"

@@ -44,7 +44,7 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 .PP

 \fB\-\-grace\-period\fP=30

-    Grace period (seconds) for pods being deleted. Optional param for \-\-evacuate

+    Grace period (seconds) for pods being deleted. Ignored if negative. Optional param for \-\-evacuate

 .PP

 \fB\-\-list\-pods\fP=false

@@ -174,6 +174,12 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 	# Migrate selected pods

 	oadm manage\-node <mynode> \-\-evacuate \-\-pod\-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	oadm manage\-node <mynode> \-\-evacuate \-\-grace\-period=60 \-\-pod\-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	oadm manage\-node <mynode> \-\-evacuate \-\-force \-\-pod\-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	oadm manage\-node <mynode> \-\-evacuate \-\-dry\-run \-\-pod\-selector="<service=myapp>"

@@ -44,7 +44,7 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 .PP

 \fB\-\-grace\-period\fP=30

-    Grace period (seconds) for pods being deleted. Optional param for \-\-evacuate

+    Grace period (seconds) for pods being deleted. Ignored if negative. Optional param for \-\-evacuate

 .PP

 \fB\-\-list\-pods\fP=false

@@ -174,6 +174,12 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 	# Migrate selected pods

 	oc adm manage\-node <mynode> \-\-evacuate \-\-pod\-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	oc adm manage\-node <mynode> \-\-evacuate \-\-grace\-period=60 \-\-pod\-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	oc adm manage\-node <mynode> \-\-evacuate \-\-force \-\-pod\-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	oc adm manage\-node <mynode> \-\-evacuate \-\-dry\-run \-\-pod\-selector="<service=myapp>"

@@ -44,7 +44,7 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 .PP

 \fB\-\-grace\-period\fP=30

-    Grace period (seconds) for pods being deleted. Optional param for \-\-evacuate

+    Grace period (seconds) for pods being deleted. Ignored if negative. Optional param for \-\-evacuate

 .PP

 \fB\-\-list\-pods\fP=false

@@ -174,6 +174,12 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 	# Migrate selected pods

 	openshift admin manage\-node <mynode> \-\-evacuate \-\-pod\-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	openshift admin manage\-node <mynode> \-\-evacuate \-\-grace\-period=60 \-\-pod\-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	openshift admin manage\-node <mynode> \-\-evacuate \-\-force \-\-pod\-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	openshift admin manage\-node <mynode> \-\-evacuate \-\-dry\-run \-\-pod\-selector="<service=myapp>"

@@ -44,7 +44,7 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 .PP

 \fB\-\-grace\-period\fP=30

-    Grace period (seconds) for pods being deleted. Optional param for \-\-evacuate

+    Grace period (seconds) for pods being deleted. Ignored if negative. Optional param for \-\-evacuate

 .PP

 \fB\-\-list\-pods\fP=false

@@ -174,6 +174,12 @@ list\-pods: List all/selected pods on given/selected nodes. It can list the outp

 	# Migrate selected pods

 	openshift cli adm manage\-node <mynode> \-\-evacuate \-\-pod\-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	openshift cli adm manage\-node <mynode> \-\-evacuate \-\-grace\-period=60 \-\-pod\-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	openshift cli adm manage\-node <mynode> \-\-evacuate \-\-force \-\-pod\-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	openshift cli adm manage\-node <mynode> \-\-evacuate \-\-dry\-run \-\-pod\-selector="<service=myapp>"

@@ -43,7 +43,7 @@ func (e *EvacuateOptions) AddFlags(cmd *cobra.Command) {

 	flags.BoolVar(&e.DryRun, flagDryRun, e.DryRun, "Show pods that will be migrated. Optional param for --evacuate")

 	flags.BoolVar(&e.Force, flagForce, e.Force, "Delete pods not backed by replication controller. Optional param for --evacuate")

-	flags.Int64Var(&e.GracePeriod, flagGracePeriod, e.GracePeriod, "Grace period (seconds) for pods being deleted. Optional param for --evacuate")

+	flags.Int64Var(&e.GracePeriod, flagGracePeriod, e.GracePeriod, "Grace period (seconds) for pods being deleted. Ignored if negative. Optional param for --evacuate")

 }

@@ -102,7 +102,11 @@ func (e *EvacuateOptions) RunEvacuate(node *kapi.Node) error {

 	errList := []error{}

 	firstPod := true

 	numPodsWithNoRC := 0

-	deleteOptions := e.makeDeleteOptions()

+

+	var deleteOptions *kapi.DeleteOptions

+	if e.GracePeriod >= 0 {

+		deleteOptions = e.makeDeleteOptions()

+	}

 	for _, pod := range pods.Items {

 		foundrc := false

@@ -36,6 +36,12 @@ list-pods: List all/selected pods on given/selected nodes. It can list the outpu

 	# Migrate selected pods

 	%[1]s <mynode> --evacuate --pod-selector="<service=myapp>"

+	# Migrate selected pods, use a grace period of 60 seconds

+	%[1]s <mynode> --evacuate --grace-period=60 --pod-selector="<service=myapp>"

+

+	# Migrate selected pods not backed by replication controller

+	%[1]s <mynode> --evacuate --force --pod-selector="<service=myapp>"

+

 	# Show pods that will be migrated

 	%[1]s <mynode> --evacuate --dry-run --pod-selector="<service=myapp>"