Make delete actually stop resources by default.

Refactor for shared code.

contrib/completions/bash/kubectl

@@ -351,6 +351,7 @@ _kubectl_delete()
     flags_completion+=("_filedir '@(json|yaml|yml)'")
     flags+=("--help")
     flags+=("-h")
+    flags+=("--recursive")
     flags+=("--selector=")
     two_word_flags+=("-l")
 

docs/kubectl.md

@@ -66,4 +66,4 @@ kubectl
 * [kubectl update](kubectl_update.md)	 - Update a resource by filename or stdin.
 * [kubectl version](kubectl_version.md)	 - Print the client and server version information.
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.488963312 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.564064886 +0000 UTC

docs/kubectl_api-versions.md

@@ -50,4 +50,4 @@ kubectl api-versions
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.488505223 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.5627252 +0000 UTC

docs/kubectl_cluster-info.md

@@ -50,4 +50,4 @@ kubectl cluster-info
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.48831375 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.562440964 +0000 UTC

docs/kubectl_config.md

@@ -63,4 +63,4 @@ kubectl config SUBCOMMAND
 * [kubectl config use-context](kubectl_config_use-context.md)	 - Sets the current-context in a kubeconfig file
 * [kubectl config view](kubectl_config_view.md)	 - displays Merged kubeconfig settings or a specified kubeconfig file.
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.488116168 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.562062414 +0000 UTC

docs/kubectl_config_set-cluster.md

@@ -65,4 +65,4 @@ $ kubectl config set-cluster e2e --insecure-skip-tls-verify=true
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.486460859 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.559277506 +0000 UTC

docs/kubectl_config_set-context.md

@@ -58,4 +58,4 @@ $ kubectl config set-context gce --user=cluster-admin
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.486736724 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.56090535 +0000 UTC

docs/kubectl_config_set-credentials.md

@@ -78,4 +78,4 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt -
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.486604006 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.560249737 +0000 UTC

docs/kubectl_config_set.md

@@ -52,4 +52,4 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.486861123 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.561157421 +0000 UTC

docs/kubectl_config_unset.md

@@ -51,4 +51,4 @@ kubectl config unset PROPERTY_NAME
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.487685494 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.561405118 +0000 UTC

docs/kubectl_config_use-context.md

@@ -50,4 +50,4 @@ kubectl config use-context CONTEXT_NAME
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.487888021 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.561696328 +0000 UTC

docs/kubectl_config_view.md

@@ -72,4 +72,4 @@ $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.486319118 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.559002095 +0000 UTC

docs/kubectl_create.md

@@ -63,4 +63,4 @@ $ cat pod.json | kubectl create -f -
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.48343431 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.552973226 +0000 UTC

docs/kubectl_delete.md

@@ -45,6 +45,7 @@ $ kubectl delete pods --all
       --all=false: [-all] to select all the specified resources
   -f, --filename=[]: Filename, directory, or URL to a file containing the resource to delete
   -h, --help=false: help for delete
+      --recursive=true: If true, try to recursively delete resources managed by this resource (e.g. Pods created by a ReplicationController).  Default true.
   -l, --selector="": Selector (label query) to filter on
 ```
 
@@ -81,4 +82,4 @@ $ kubectl delete pods --all
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.483731878 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.55368753 +0000 UTC

docs/kubectl_describe.md

@@ -53,4 +53,4 @@ kubectl describe RESOURCE ID
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.483293174 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.552614646 +0000 UTC

docs/kubectl_exec.md

@@ -64,4 +64,4 @@ $ kubectl exec -p 123456-7890 -c ruby-container -i -t -- bash -il
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.484697863 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.555910965 +0000 UTC

docs/kubectl_expose.md

@@ -82,4 +82,4 @@ $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.485803902 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.558136731 +0000 UTC

docs/kubectl_get.md

@@ -85,4 +85,4 @@ $ kubectl get rc/web service/frontend pods/web-pod-13je7
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.482589064 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.552136955 +0000 UTC

docs/kubectl_label.md

@@ -81,4 +81,4 @@ $ kubectl label pods foo bar-
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.486060232 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.558574442 +0000 UTC

docs/kubectl_log.md

@@ -62,4 +62,4 @@ $ kubectl log -f 123456-7890 ruby-container
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.484139739 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.554170011 +0000 UTC

docs/kubectl_namespace.md

@@ -53,4 +53,4 @@ kubectl namespace [namespace]
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.483937463 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.553914105 +0000 UTC

docs/kubectl_port-forward.md

@@ -68,4 +68,4 @@ $ kubectl port-forward -p mypod 0:5000
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.484899751 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.556477044 +0000 UTC

docs/kubectl_proxy.md

@@ -65,4 +65,4 @@ $ kubectl proxy --api-prefix=k8s-api
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.485099157 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.556873406 +0000 UTC

docs/kubectl_resize.md

@@ -68,4 +68,4 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.484493463 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.555354068 +0000 UTC

docs/kubectl_rolling-update.md

@@ -68,4 +68,4 @@ $ cat frontend-v2.json | kubectl rolling-update frontend-v1 -f -
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.484316119 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.554380414 +0000 UTC

docs/kubectl_run-container.md

@@ -78,4 +78,4 @@ $ kubectl run-container nginx --image=nginx --overrides='{ "apiVersion": "v1beta
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.485362986 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.557258783 +0000 UTC

docs/kubectl_stop.md

@@ -72,4 +72,4 @@ $ kubectl stop -f path/to/resources
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.48555328 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.55753913 +0000 UTC

docs/kubectl_update.md

@@ -67,4 +67,4 @@ $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState":
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.483572524 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.553343481 +0000 UTC

docs/kubectl_version.md

@@ -51,4 +51,4 @@ kubectl version
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-04-17 18:59:11.488692518 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-04-23 04:15:00.563064053 +0000 UTC

docs/man/man1/kubectl-delete.1

@@ -41,6 +41,10 @@ will be lost along with the rest of the resource.
 \fB\-h\fP, \fB\-\-help\fP=false
     help for delete
 
+.PP
+\fB\-\-recursive\fP=true
+    If true, try to recursively delete resources managed by this resource (e.g. Pods created by a ReplicationController).  Default true.
+
 .PP
 \fB\-l\fP, \fB\-\-selector\fP=""
     Selector (label query) to filter on

pkg/kubectl/cmd/delete.go

@@ -72,6 +72,7 @@ func NewCmdDelete(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 	kubectl.AddJsonFilenameFlag(cmd, &filenames, usage)
 	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")
 	cmd.Flags().Bool("all", false, "[-all] to select all the specified resources")
+	cmd.Flags().Bool("recursive", true, "If true, try to recursively delete resources managed by this resource (e.g. Pods created by a ReplicationController).  Default true.")
 	return cmd
 }
 
@@ -95,8 +96,37 @@ func RunDelete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
 		return err
 	}
 
+	// By default use a reaper to delete all related resources.
+	if cmdutil.GetFlagBool(cmd, "recursive") {
+		return ReapResult(r, f, out)
+	}
+	return DeleteResult(r, out)
+}
+
+func ReapResult(r *resource.Result, f *cmdutil.Factory, out io.Writer) error {
+	found := 0
+	err := r.Visit(func(info *resource.Info) error {
+		found++
+		reaper, err := f.Reaper(info.Mapping)
+		cmdutil.CheckErr(err)
+		if _, err := reaper.Stop(info.Namespace, info.Name); err != nil {
+			return err
+		}
+		fmt.Fprintf(out, "%s/%s\n", info.Mapping.Resource, info.Name)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	if found == 0 {
+		fmt.Fprintf(out, "No resources found\n")
+	}
+	return nil
+}
+
+func DeleteResult(r *resource.Result, out io.Writer) error {
 	found := 0
-	err = r.IgnoreErrors(errors.IsNotFound).Visit(func(r *resource.Info) error {
+	err := r.IgnoreErrors(errors.IsNotFound).Visit(func(r *resource.Info) error {
 		found++
 		if err := resource.NewHelper(r.Client, r.Mapping).Delete(r.Namespace, r.Name); err != nil {
 			return err
@@ -108,7 +138,7 @@ func RunDelete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
 		return err
 	}
 	if found == 0 {
-		fmt.Fprintf(cmd.Out(), "No resources found\n")
+		fmt.Fprintf(out, "No resources found\n")
 	}
 	return nil
 }

pkg/kubectl/cmd/delete_test.go

@@ -50,6 +50,7 @@ func TestDeleteObjectByTuple(t *testing.T) {
 
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("namespace", "test")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{"replicationcontrollers/redis-master-controller"})
 
 	if buf.String() != "replicationControllers/redis-master-controller\n" {
@@ -80,6 +81,7 @@ func TestDeleteNamedObject(t *testing.T) {
 
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("namespace", "test")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{"replicationcontrollers", "redis-master-controller"})
 
 	if buf.String() != "replicationControllers/redis-master-controller\n" {
@@ -109,6 +111,7 @@ func TestDeleteObject(t *testing.T) {
 
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/redis-master-controller.json")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{})
 
 	// uses the name from the file, not the response
@@ -137,6 +140,7 @@ func TestDeleteObjectIgnoreNotFound(t *testing.T) {
 
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/redis-master-controller.json")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{})
 
 	if buf.String() != "" {
@@ -169,6 +173,7 @@ func TestDeleteMultipleObject(t *testing.T) {
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/redis-master-controller.json")
 	cmd.Flags().Set("filename", "../../../examples/guestbook/frontend-service.json")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{})
 
 	if buf.String() != "replicationControllers/redis-master-controller\nservices/frontend\n" {
@@ -201,6 +206,7 @@ func TestDeleteMultipleObjectIgnoreMissing(t *testing.T) {
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook/redis-master-controller.json")
 	cmd.Flags().Set("filename", "../../../examples/guestbook/frontend-service.json")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{})
 
 	if buf.String() != "services/frontend\n" {
@@ -232,6 +238,7 @@ func TestDeleteDirectory(t *testing.T) {
 
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("filename", "../../../examples/guestbook")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{})
 
 	if buf.String() != "replicationControllers/frontend-controller\nservices/frontend\nreplicationControllers/redis-master-controller\nservices/redis-master\nreplicationControllers/redis-slave-controller\nservices/redis-slave\n" {
@@ -273,6 +280,7 @@ func TestDeleteMultipleSelector(t *testing.T) {
 
 	cmd := NewCmdDelete(f, buf)
 	cmd.Flags().Set("selector", "a=b")
+	cmd.Flags().Set("recursive", "false")
 	cmd.Run(cmd, []string{"pods,services"})
 
 	if buf.String() != "pods/foo\npods/bar\nservices/baz\n" {

pkg/kubectl/cmd/stop.go

@@ -17,7 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
 	"io"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
@@ -69,15 +68,7 @@ func NewCmdStop(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 				Do()
 			cmdutil.CheckErr(r.Err())
 
-			r.Visit(func(info *resource.Info) error {
-				reaper, err := f.Reaper(info.Mapping)
-				cmdutil.CheckErr(err)
-				if _, err := reaper.Stop(info.Namespace, info.Name); err != nil {
-					return err
-				}
-				fmt.Fprintf(out, "%s/%s\n", info.Mapping.Resource, info.Name)
-				return nil
-			})
+			cmdutil.CheckErr(ReapResult(r, f, out))
 		},
 	}
 	usage := "Filename, directory, or URL to file of resource(s) to be stopped"