Provide easy delete of resources for new-app and generate

Author: Kargakis

hack/test-cmd.sh

@@ -449,10 +449,18 @@ echo "ex registry: ok"
 [ "$(openshift ex build-chain --all -o dot | grep 'graph')" ]
 echo "ex build-chain: ok"
 
-osc get minions,pods
-
 osadm new-project example --admin="createuser"
 osc project example
 osc create -f test/fixtures/app-scenarios
 osc status
-echo "complex-scenarios: ok"
+echo "complex-scenarios: ok"
+
+# Clean-up everything before testing cleaning up everything...
+osc delete all -l template=application-template-stibuild
+osc process -f examples/sample-app/application-template-stibuild.json -l name=mytemplate | osc create -f -
+osc delete all -l name=mytemplate
+osc new-app https://github.com/openshift/ruby-hello-world -l name=hello-world
+osc delete all -l name=hello-world
+openshift ex generate https://github.com/openshift/ruby-hello-world -l name=hello-world | osc create -f -
+osc delete all -l name=hello-world
+echo "delete all: ok"

pkg/api/latest/latest.go

@@ -79,6 +79,9 @@ var originTypes = []string{
 	"Role", "RoleBinding", "Policy", "PolicyBinding", "ResourceAccessReview", "SubjectAccessReview",
 }
 
+// UserResources is a group of user-defined resources
+var UserResources = []string{"bc", "builds", "services", "imageStreams", "pods", "routes", "dc", "rc"}
+
 // OriginKind returns true if OpenShift owns the kind described in a given apiVersion.
 // TODO: make this based on scheme information or other behavior
 func OriginKind(kind, apiVersion string) bool {

pkg/api/meta/multimapper.go

@@ -32,3 +32,15 @@ func (m MultiRESTMapper) RESTMapping(kind string, versions ...string) (mapping *
 	}
 	return
 }
+
+// AliasesForResource returns whether a resource has an alias or not. This implementation
+// supports multiple REST schemas and return the first match.
+func (m MultiRESTMapper) AliasesForResource(resource string) (aliases []string, has bool) {
+	for _, t := range m {
+		aliases, has = t.AliasesForResource(resource)
+		if has {
+			return
+		}
+	}
+	return
+}

pkg/cmd/cli/cmd/newapp.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	ctl "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"
 	"github.com/golang/glog"
@@ -17,6 +18,7 @@ import (
 	configcmd "github.com/openshift/origin/pkg/config/cmd"
 	newcmd "github.com/openshift/origin/pkg/generate/app/cmd"
 	imageapi "github.com/openshift/origin/pkg/image/api"
+	"github.com/openshift/origin/pkg/util"
 )
 
 type usage interface {
@@ -46,6 +48,9 @@ Examples:
 	# Use a MySQL image in a private registry to create an app
 	$ %[1]s new-app myregistry.com/mycompany/mysql
 
+	# Create an application from the remote repository using the specified label
+	$ %[1]s new-app https://github.com/openshift/ruby-hello-world -l name=hello-world
+
 If you specify source code, you may need to run a build with 'start-build' after the
 application is created.
 
@@ -76,6 +81,7 @@ func NewCmdNewApplication(fullName string, f *clientcmd.Factory, out io.Writer)
 	cmd.Flags().Var(&config.Groups, "group", "Indicate components that should be grouped together as <comp1>+<comp2>.")
 	cmd.Flags().VarP(&config.Environment, "env", "e", "Specify key value pairs of environment variables to set into each container.")
 	cmd.Flags().StringVar(&config.TypeOfBuild, "build", "", "Specify the type of build to use if you don't want to detect (docker|source)")
+	cmd.Flags().StringP("labels", "l", "", "Label to set in all resources for this application")
 
 	cmdutil.AddPrinterFlags(cmd)
 
@@ -121,6 +127,17 @@ func RunNewApplication(f *clientcmd.Factory, out io.Writer, c *cobra.Command, ar
 		return err
 	}
 
+	label := cmdutil.GetFlagString(c, "labels")
+	if len(label) != 0 {
+		lbl := ctl.ParseLabels(label)
+		for _, object := range result.List.Items {
+			err = util.AddObjectLabels(object, lbl)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	if len(cmdutil.GetFlagString(c, "output")) != 0 {
 		return f.Factory.PrintObject(c, result.List, out)
 	}

pkg/cmd/cli/cmd/process.go

@@ -8,7 +8,8 @@ import (
 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
-	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
+	ctl "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
+	kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/golang/glog"
@@ -23,7 +24,7 @@ import (
 // injectUserVars injects user specified variables into the Template
 func injectUserVars(cmd *cobra.Command, t *api.Template) {
 	values := util.StringList{}
-	values.Set(cmdutil.GetFlagString(cmd, "value"))
+	values.Set(kcmdutil.GetFlagString(cmd, "value"))
 	for _, keypair := range values {
 		p := strings.SplitN(keypair, "=", 2)
 		if len(p) != 2 {
@@ -49,6 +50,9 @@ Examples:
 	# Convert template.json file into resource list
 	$ %[1]s process -f template.json
 
+	# Process template while passing a user-defined label
+	$ %[1]s process -f template.json -l name=mytemplate
+
 	# Convert stored template into resource list
 	$ %[1]s process foo
 
@@ -64,15 +68,16 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.
 		Long:  fmt.Sprintf(processLongDesc, fullName),
 		Run: func(cmd *cobra.Command, args []string) {
 			err := RunProcess(f, out, cmd, args)
-			cmdutil.CheckErr(err)
+			kcmdutil.CheckErr(err)
 		},
 	}
 
-	cmdutil.AddPrinterFlags(cmd)
+	kcmdutil.AddPrinterFlags(cmd)
 
 	cmd.Flags().StringP("filename", "f", "", "Filename or URL to file to use to update the resource")
 	cmd.Flags().StringP("value", "v", "", "Specify a list of key-value pairs (eg. -v FOO=BAR,BAR=FOO) to set/override parameter values")
 	cmd.Flags().BoolP("parameters", "", false, "Do not process but only print available parameters")
+	cmd.Flags().StringP("labels", "l", "", "Label to set in all resources for this template")
 	return cmd
 }
 
@@ -82,9 +87,9 @@ func RunProcess(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []
 		storedTemplate = args[0]
 	}
 
-	filename := cmdutil.GetFlagString(cmd, "filename")
+	filename := kcmdutil.GetFlagString(cmd, "filename")
 	if len(storedTemplate) == 0 && len(filename) == 0 {
-		return cmdutil.UsageError(cmd, "Must pass a filename or name of stored template")
+		return kcmdutil.UsageError(cmd, "Must pass a filename or name of stored template")
 	}
 
 	namespace, err := f.DefaultNamespace()
@@ -158,14 +163,22 @@ func RunProcess(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, args []
 
 	// If 'parameters' flag is set it does not do processing but only print
 	// the template parameters to console for inspection.
-	if cmdutil.GetFlagBool(cmd, "parameters") == true {
+	if kcmdutil.GetFlagBool(cmd, "parameters") == true {
 		err = describe.PrintTemplateParameters(templateObj.Parameters, out)
 		if err != nil {
 			return err
 		}
 		return nil
 	}
 
+	label := kcmdutil.GetFlagString(cmd, "labels")
+	if len(label) != 0 {
+		lbl := ctl.ParseLabels(label)
+		for key, value := range lbl {
+			templateObj.ObjectLabels[key] = value
+		}
+	}
+
 	result, err := client.TemplateConfigs(namespace).Create(templateObj)
 	if err != nil {
 		return err

pkg/cmd/experimental/generate/generate.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	ctl "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	kcmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"
 	"github.com/fsouza/go-dockerclient"
@@ -21,6 +22,7 @@ import (
 	genapp "github.com/openshift/origin/pkg/generate/app"
 	gen "github.com/openshift/origin/pkg/generate/generator"
 	"github.com/openshift/origin/pkg/generate/source"
+	"github.com/openshift/origin/pkg/util"
 )
 
 const longDescription = `
@@ -50,6 +52,9 @@ Examples:
     # Find a git repository in the current directory and build artifacts based on detection
     $ openshift ex generate
 
+    # Build artifacts from a git repository in the current directory using the specified label
+    $ openshift ex generate -l name=hello-world
+
     # Specify the directory for the repository to use
     $ openshift ex generate ./repo/dir
 
@@ -97,6 +102,7 @@ func NewCmdGenerate(f *clientcmd.Factory, parentName, name string, out io.Writer
 	flag.StringVarP(&input.port, "port", "p", "", "Port to expose on pod deployment")
 	flag.StringVarP(&environment, "environment", "e", "", "Comma-separated list of environment variables to add to the deployment."+
 		"Should be in the form of var1=value1,var2=value2,...")
+	flag.StringP("labels", "l", "", "Label to set in all resources for this configuration")
 	kcmdutil.AddPrinterFlags(c)
 	dockerHelper.InstallFlags(flag)
 	return c
@@ -150,6 +156,17 @@ func RunGenerate(f *clientcmd.Factory, out io.Writer, c *cobra.Command, args []s
 		return err
 	}
 
+	label := kcmdutil.GetFlagString(c, "labels")
+	if len(label) != 0 {
+		lbl := ctl.ParseLabels(label)
+		for _, object := range list.Items {
+			err = util.AddObjectLabels(object, lbl)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	// Output config
 	setDefaultPrinter(c)
 	return f.Factory.PrintObject(c, list, out)

pkg/cmd/util/clientcmd/factory.go

@@ -134,6 +134,18 @@ func (e ShortcutExpander) VersionAndKindForResource(resource string) (defaultVer
 	return e.RESTMapper.VersionAndKindForResource(resource)
 }
 
+// AliasesForResource returns whether a resource has an alias or not
+func (e ShortcutExpander) AliasesForResource(resource string) ([]string, bool) {
+	aliases := map[string][]string{
+		"all": latest.UserResources,
+	}
+
+	if res, ok := aliases[resource]; ok {
+		return res, true
+	}
+	return nil, false
+}
+
 // expandResourceShortcut will return the expanded version of resource
 // (something that a pkg/api/meta.RESTMapper can understand), if it is
 // indeed a shortcut. Otherwise, will return resource unmodified.