Make kubectl stop take -f flag (for filename|url|directory)

nikhiljindal · Feb 17, 2015 · b786c11 · b786c11
1 parent 59541e9
commit b786c11
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 18 deletions.
diff --git a/docs/kubectl.md b/docs/kubectl.md
@@ -416,7 +416,7 @@ Additional help topics:
   kubectl rollingupdate Perform a rolling update of the given ReplicationController.
   kubectl resize        Set a new size for a Replication Controller.
   kubectl run-container Run a particular image on the cluster.
-  kubectl stop          Gracefully shut down a resource.
+  kubectl stop          Gracefully shut down a resource by id or filename.
   kubectl expose        Take a replicated application and expose it as Kubernetes Service
   kubectl label         Update the labels on a resource
 
@@ -986,7 +986,7 @@ Global Flags:
 ```
 
 #### stop
-Gracefully shut down a resource.
+Gracefully shut down a resource by id or filename.
 
 Attempts to shut down and delete a resource that supports graceful termination.
 If the resource is resizable it will be resized to 0 before deletion.
@@ -996,10 +996,18 @@ Examples:
     // Shut down foo.
     $ kubectl stop replicationcontroller foo
 
+    // Shut down the service defined in service.json
+    $ kubectl stop -f service.json
+
+    // Shut down all resources in the path/to/resources directory
+    $ kubectl stop -f path/to/resources
+
 Usage:
 ```
-  kubectl stop <resource> <id> [flags]
+  kubectl stop (<resource> <id>|-f filename) [flags]
 
+Flags:
+  -f, --filename=[]: Filename, directory, or URL to file of resource(s) to be stopped
 
 Global Flags:
       --alsologtostderr=false: log to standard error as well as files

diff --git a/pkg/kubectl/cmd/stop.go b/pkg/kubectl/cmd/stop.go
@@ -20,38 +20,58 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/spf13/cobra"
 )
 
 func (f *Factory) NewCmdStop(out io.Writer) *cobra.Command {
+	flags := &struct {
+		Filenames util.StringList
+	}{}
 	cmd := &cobra.Command{
-		Use:   "stop <resource> <id>",
-		Short: "Gracefully shut down a resource.",
-		Long: `Gracefully shut down a resource.
+		Use:   "stop (<resource> <id>|-f filename)",
+		Short: "Gracefully shut down a resource by id or filename.",
+		Long: `Gracefully shut down a resource by id or filename.
 
 Attempts to shut down and delete a resource that supports graceful termination.
 If the resource is resizable it will be resized to 0 before deletion.
 
 Examples:
 
     // Shut down foo.
-    $ kubectl stop replicationcontroller foo`,
+    $ kubectl stop replicationcontroller foo
+
+    // Shut down the service defined in service.json
+    $ kubectl stop -f service.json
+
+    // Shut down all resources in the path/to/resources directory
+    $ kubectl stop -f path/to/resources`,
 		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) != 2 {
-				usageError(cmd, "<resource> <id>")
-			}
 			cmdNamespace, err := f.DefaultNamespace(cmd)
-			mapper, _ := f.Object(cmd)
-			mapping, namespace, name := util.ResourceFromArgs(cmd, args, mapper, cmdNamespace)
-
-			reaper, err := f.Reaper(cmd, mapping)
 			checkErr(err)
+			mapper, typer := f.Object(cmd)
+			r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand(cmd)).
+				ContinueOnError().
+				NamespaceParam(cmdNamespace).RequireNamespace().
+				ResourceTypeOrNameArgs(false, args...).
+				FilenameParam(flags.Filenames...).
+				Flatten().
+				Do()
+			checkErr(r.Err())
 
-			s, err := reaper.Stop(namespace, name)
-			checkErr(err)
-			fmt.Fprintf(out, "%s\n", s)
+			r.Visit(func(info *resource.Info) error {
+				reaper, err := f.Reaper(cmd, info.Mapping)
+				checkErr(err)
+				s, err := reaper.Stop(info.Namespace, info.Name)
+				if err != nil {
+					return err
+				}
+				fmt.Fprintf(out, "%s\n", s)
+				return nil
+			})
 		},
 	}
+	cmd.Flags().VarP(&flags.Filenames, "filename", "f", "Filename, directory, or URL to file of resource(s) to be stopped")
 	return cmd
 }