Merge pull request #23756 from smarterclayton/force_delete

Add a client flag to delete "--now" for grace period 0

docs/man/man1/kubectl-delete.1

@@ -52,6 +52,10 @@ will be lost along with the rest of the resource.
 \fB\-\-include\-extended\-apis\fP=true
     If true, include definitions of new APIs via calls to the API server. [default true]
 
+.PP
+\fB\-\-now\fP=false
+    If true, resources are force terminated without graceful deletion (same as \-\-grace\-period=0).
+
 .PP
 \fB\-o\fP, \fB\-\-output\fP=""
     Output mode. Use "\-o name" for shorter output (resource/name).
@@ -184,6 +188,9 @@ kubectl delete pod,service baz foo
 # Delete pods and services with label name=myLabel.
 kubectl delete pods,services \-l name=myLabel
 
+# Delete a pod immediately (no graceful shutdown)
+kubectl delete pod foo \-\-now
+
 # Delete a pod with UID 1234\-56\-7890\-234234\-456456.
 kubectl delete pod 1234\-56\-7890\-234234\-456456
 

docs/user-guide/kubectl/kubectl_delete.md

@@ -68,6 +68,9 @@ kubectl delete pod,service baz foo
 # Delete pods and services with label name=myLabel.
 kubectl delete pods,services -l name=myLabel
 
+# Delete a pod immediately (no graceful shutdown)
+kubectl delete pod foo --now
+
 # Delete a pod with UID 1234-56-7890-234234-456456.
 kubectl delete pod 1234-56-7890-234234-456456
 
@@ -84,6 +87,7 @@ kubectl delete pods --all
       --grace-period=-1: Period of time in seconds given to the resource to terminate gracefully. Ignored if negative.
       --ignore-not-found[=false]: Treat "resource not found" as a successful delete. Defaults to "true" when --all is specified.
       --include-extended-apis[=true]: If true, include definitions of new APIs via calls to the API server. [default true]
+      --now[=false]: If true, resources are force terminated without graceful deletion (same as --grace-period=0).
   -o, --output="": Output mode. Use "-o name" for shorter output (resource/name).
   -R, --recursive[=false]: If true, process directory recursively.
   -l, --selector="": Selector (label query) to filter on.
@@ -122,7 +126,7 @@ kubectl delete pods --all
 
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra on 30-Mar-2016
+###### Auto generated by spf13/cobra on 6-Apr-2016
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_delete.md?pixel)]()