Merge pull request #4381 from sdminonne/bug_fix

kubectl delete resource : remove all resources

docs/kubectl.md

@@ -315,11 +315,15 @@ Examples:
     // Delete a pod with ID 1234-56-7890-234234-456456.
     $ kubectl delete pod 1234-56-7890-234234-456456
 
+    // Delete all pods
+    $ kubectl delete pods --all
+
 Usage:
 ```
-  kubectl delete ([-f filename] | (<resource> [(<id> | -l <label>)] [flags]
+  kubectl delete ([-f filename] | (<resource> [(<id> | -l <label> | --all)] [flags]
 
 Flags:
+      --all=false: [-all] to select all the specified resources
   -f, --filename=[]: Filename, directory, or URL to a file containing the resource to delete
   -l, --selector="": Selector (label query) to filter on
 

hack/test-cmd.sh

@@ -145,6 +145,16 @@ for version in "${kube_api_versions[@]}"; do
   kubectl get pods -o yaml --output-version=v1beta1 "${kube_flags[@]}" | grep -q "id: redis-master"
   kubectl describe pod redis-master "${kube_flags[@]}" | grep -q 'Name:.*redis-master'
   kubectl delete -f examples/guestbook/redis-master.json "${kube_flags[@]}"
+  kubectl delete pods -l name=redis-master "${kube_flags[@]}"
+  [ ! $(kubectl get pods "${kube_flags[@]}" -lname=redis-master | grep -q 'redis-master') ]
+  kubectl create -f examples/guestbook/redis-master.json "${kube_flags[@]}"
+  kubectl get pods "${kube_flags[@]}" -lname=redis-master | grep -q 'redis-master'
+  [ ! $(kubectl delete pods "${kube_flags[@]}" ) ]
+  kubectl get pods "${kube_flags[@]}" -lname=redis-master | grep -q 'redis-master'
+  [ ! $(delete pods --all pods -l name=redis-master) ]   # not --all and label selector together
+  kubectl delete --all pods "${kube_flags[@]}" # --all remove all the pods
+  howmanypods="$(kubectl get pods  -o template -t "{{ len .items }}" "${kube_flags[@]}")"
+  [ "$howmanypods" -eq 0 ]
 
   kube::log::status "Testing kubectl(${version}:services)"
   kubectl get services "${kube_flags[@]}"

pkg/kubectl/cmd/delete.go

@@ -33,7 +33,7 @@ func (f *Factory) NewCmdDelete(out io.Writer) *cobra.Command {
 		Filenames util.StringList
 	}{}
 	cmd := &cobra.Command{
-		Use:   "delete ([-f filename] | (<resource> [(<id> | -l <label>)]",
+		Use:   "delete ([-f filename] | (<resource> [(<id> | -l <label> | --all)]",
 		Short: "Delete a resource by filename, stdin, or resource and ID.",
 		Long: `Delete a resource by filename, stdin, resource and ID, or by resources and label selector.
 
@@ -58,18 +58,22 @@ Examples:
     $ kubectl delete pods,services -l name=myLabel
 
     // Delete a pod with ID 1234-56-7890-234234-456456.
-    $ kubectl delete pod 1234-56-7890-234234-456456`,
+    $ kubectl delete pod 1234-56-7890-234234-456456
+
+    // Delete all pods
+    $ kubectl delete pods --all`,
+
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdNamespace, err := f.DefaultNamespace(cmd)
 			checkErr(err)
-
 			mapper, typer := f.Object(cmd)
 			r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand(cmd)).
 				ContinueOnError().
 				NamespaceParam(cmdNamespace).DefaultNamespace().
 				FilenameParam(flags.Filenames...).
 				SelectorParam(cmdutil.GetFlagString(cmd, "selector")).
-				ResourceTypeOrNameArgs(args...).
+				SelectAllParam(cmdutil.GetFlagBool(cmd, "all")).
+				ResourceTypeOrNameArgs(false, args...).
 				Flatten().
 				Do()
 			checkErr(r.Err())
@@ -91,5 +95,6 @@ Examples:
 	}
 	cmd.Flags().VarP(&flags.Filenames, "filename", "f", "Filename, directory, or URL to a file containing the resource to delete")
 	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")
+	cmd.Flags().Bool("all", false, "[-all] to select all the specified resources")
 	return cmd
 }

pkg/kubectl/cmd/delete_test.go

@@ -22,7 +22,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 )
 
@@ -83,37 +82,6 @@ func TestDeleteObjectIgnoreNotFound(t *testing.T) {
 	}
 }
 
-func TestDeleteNoObjects(t *testing.T) {
-	f, tf, codec := NewAPIFactory()
-	tf.Printer = &testPrinter{}
-	tf.Client = &client.FakeRESTClient{
-		Codec: codec,
-		Client: client.HTTPClientFunc(func(req *http.Request) (*http.Response, error) {
-			switch p, m := req.URL.Path, req.Method; {
-			case p == "/namespaces/test/pods" && m == "GET":
-				return &http.Response{StatusCode: 200, Body: objBody(codec, &api.PodList{})}, nil
-			default:
-				t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
-				return nil, nil
-			}
-		}),
-	}
-	tf.Namespace = "test"
-	buf := bytes.NewBuffer([]byte{})
-	stderr := bytes.NewBuffer([]byte{})
-
-	cmd := f.NewCmdDelete(buf)
-	cmd.SetOutput(stderr)
-	cmd.Run(cmd, []string{"pods"})
-
-	if buf.String() != "" {
-		t.Errorf("unexpected output: %s", buf.String())
-	}
-	if stderr.String() != "No resources found\n" {
-		t.Errorf("unexpected output: %s", stderr.String())
-	}
-}
-
 func TestDeleteMultipleObject(t *testing.T) {
 	pods, svc := testData()
 

pkg/kubectl/cmd/get.go

@@ -87,7 +87,7 @@ func RunGet(f *Factory, out io.Writer, cmd *cobra.Command, args []string) {
 		r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand(cmd)).
 			NamespaceParam(cmdNamespace).DefaultNamespace().
 			SelectorParam(selector).
-			ResourceTypeOrNameArgs(args...).
+			ResourceTypeOrNameArgs(true, args...).
 			SingleResourceType().
 			Do()
 		checkErr(r.Err())
@@ -124,7 +124,7 @@ func RunGet(f *Factory, out io.Writer, cmd *cobra.Command, args []string) {
 	b := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand(cmd)).
 		NamespaceParam(cmdNamespace).DefaultNamespace().
 		SelectorParam(selector).
-		ResourceTypeOrNameArgs(args...).
+		ResourceTypeOrNameArgs(true, args...).
 		Latest()
 	printer, generic, err := util.PrinterForCommand(cmd)
 	checkErr(err)

pkg/kubectl/resource/builder.go

@@ -42,7 +42,8 @@ type Builder struct {
 	stream bool
 	dir    bool
 
-	selector labels.Selector
+	selector  labels.Selector
+	selectAll bool
 
 	resources []string
 
@@ -171,6 +172,10 @@ func (b *Builder) SelectorParam(s string) *Builder {
 	if selector.Empty() {
 		return b
 	}
+	if b.selectAll {
+		b.errs = append(b.errs, fmt.Errorf("found non empty selector %q with previously set 'all' parameter. ", s))
+		return b
+	}
 	return b.Selector(selector)
 }
 
@@ -202,19 +207,29 @@ func (b *Builder) RequireNamespace() *Builder {
 	return b
 }
 
+// SelectEverythingParam
+func (b *Builder) SelectAllParam(selectAll bool) *Builder {
+	if selectAll && b.selector != nil {
+		b.errs = append(b.errs, fmt.Errorf("setting 'all' parameter but found a non empty selector. "))
+		return b
+	}
+	b.selectAll = selectAll
+	return b
+}
+
 // ResourceTypeOrNameArgs indicates that the builder should accept one or two arguments
 // of the form `(<type1>[,<type2>,...]|<type> <name>)`. When one argument is received, the types
 // provided will be retrieved from the server (and be comma delimited).  When two arguments are
 // received, they must be a single type and name. If more than two arguments are provided an
-// error is set.
-func (b *Builder) ResourceTypeOrNameArgs(args ...string) *Builder {
+// error is set. The allowEmptySelector permits to select all the resources (via Everything func).
+func (b *Builder) ResourceTypeOrNameArgs(allowEmptySelector bool, args ...string) *Builder {
 	switch len(args) {
 	case 2:
 		b.name = args[1]
 		b.ResourceTypes(SplitResourceArgument(args[0])...)
 	case 1:
 		b.ResourceTypes(SplitResourceArgument(args[0])...)
-		if b.selector == nil {
+		if b.selector == nil && allowEmptySelector {
 			b.selector = labels.Everything()
 		}
 	case 0:
@@ -291,6 +306,10 @@ func (b *Builder) visitorResult() *Result {
 		return &Result{err: errors.NewAggregate(b.errs)}
 	}
 
+	if b.selectAll {
+		b.selector = labels.Everything()
+	}
+
 	// visit selectors
 	if b.selector != nil {
 		if len(b.name) != 0 {

pkg/kubectl/resource/builder_test.go

@@ -315,7 +315,7 @@ func TestResourceByName(t *testing.T) {
 		t.Errorf("unexpected non-error")
 	}
 
-	b.ResourceTypeOrNameArgs("pods", "foo")
+	b.ResourceTypeOrNameArgs(true, "pods", "foo")
 
 	err := b.Do().IntoSingular(&singular).Visit(test.Handle)
 	if err != nil || !singular || len(test.Infos) != 1 {
@@ -341,7 +341,7 @@ func TestResourceByNameAndEmptySelector(t *testing.T) {
 	})).
 		NamespaceParam("test").
 		SelectorParam("").
-		ResourceTypeOrNameArgs("pods", "foo")
+		ResourceTypeOrNameArgs(true, "pods", "foo")
 
 	singular := false
 	infos, err := b.Do().IntoSingular(&singular).Infos()
@@ -378,7 +378,7 @@ func TestSelector(t *testing.T) {
 		t.Errorf("unexpected non-error")
 	}
 
-	b.ResourceTypeOrNameArgs("pods,service")
+	b.ResourceTypeOrNameArgs(true, "pods,service")
 
 	err := b.Do().IntoSingular(&singular).Visit(test.Handle)
 	if err != nil || singular || len(test.Infos) != 3 {
@@ -408,7 +408,7 @@ func TestSingleResourceType(t *testing.T) {
 	b := NewBuilder(latest.RESTMapper, api.Scheme, fakeClient()).
 		SelectorParam("a=b").
 		SingleResourceType().
-		ResourceTypeOrNameArgs("pods,services")
+		ResourceTypeOrNameArgs(true, "pods,services")
 
 	if b.Do().Err() == nil {
 		t.Errorf("unexpected non-error")
@@ -498,7 +498,7 @@ func TestListObject(t *testing.T) {
 	})).
 		SelectorParam("a=b").
 		NamespaceParam("test").
-		ResourceTypeOrNameArgs("pods").
+		ResourceTypeOrNameArgs(true, "pods").
 		Flatten()
 
 	obj, err := b.Do().Object()
@@ -531,7 +531,7 @@ func TestListObjectWithDifferentVersions(t *testing.T) {
 	})).
 		SelectorParam("a=b").
 		NamespaceParam("test").
-		ResourceTypeOrNameArgs("pods,services").
+		ResourceTypeOrNameArgs(true, "pods,services").
 		Flatten().
 		Do().Object()