@@ -104,24 +104,24 @@ export OPENSHIFT_PROFILE="${CLI_PROFILE-}"

 [ "$(openshift ex config 2>&1)" ]

 [ "$(openshift ex tokens)" ]

 [ "$(openshift ex policy  2>&1)" ]

-[ "$(openshift kubectl)" ]

+[ "$(openshift kubectl 2>&1)" ]

 [ "$(openshift kube 2>&1)" ]

 # help for root commands must be consistent

 [ "$(openshift | grep 'OpenShift for Admins')" ]

 [ "$(osc | grep 'OpenShift Client')" ]

 [ "$(openshift cli | grep 'OpenShift Client')" ]

-[ "$(openshift kubectl | grep 'OpenShift Client')" ]

+[ "$(openshift kubectl 2>&1 | grep 'Kubernetes cluster')" ]

 # help for root commands with --help flag must be consistent

 [ "$(openshift --help 2>&1 | grep 'OpenShift for Admins')" ]

 [ "$(osc --help 2>&1 | grep 'OpenShift Client')" ]

 [ "$(openshift cli --help 2>&1 | grep 'OpenShift Client')" ]

-[ "$(openshift kubectl --help 2>&1 | grep 'OpenShift Client')" ]

+[ "$(openshift kubectl --help 2>&1 | grep 'Kubernetes cluster')" ]

 # help for root commands through help command must be consistent

 [ "$(openshift help cli 2>&1 | grep 'OpenShift Client')" ]

-[ "$(openshift help kubectl 2>&1 | grep 'OpenShift Client')" ]

+[ "$(openshift help kubectl 2>&1 | grep 'Kubernetes cluster')" ]

 # help for given command with --help flag must be consistent

 [ "$(osc get --help 2>&1 | grep 'Display one or many resources')" ]

@@ -185,6 +185,10 @@ osc get imageRepositories

 osc delete imageRepositories test

 echo "imageRepositoryMappings: ok"

+[ "$(osc new-app php mysql -o yaml | grep 3306)" ]

+osc new-app php mysql

+echo "new-app: ok"

+

 osc get routes

 osc create -f test/integration/fixtures/test-route.json create routes

 osc delete routes testroute

@@ -4,7 +4,6 @@ import (

 	"fmt"

 	"os"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 	kubecmd "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

@@ -12,6 +11,7 @@ import (

 	"github.com/openshift/origin/pkg/cmd/cli/cmd"

 	"github.com/openshift/origin/pkg/cmd/templates"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

 const longDesc = `

@@ -41,28 +41,20 @@ created for you.

 Note: This is an alpha release of OpenShift and will change significantly.  See

     https://github.com/openshift/origin for the latest information on OpenShift.

 `

-const defaultClusterURL = "https://localhost:8443"

 func NewCommandCLI(name, fullName string) *cobra.Command {

 	// Main command

 	cmds := &cobra.Command{

-		Use:     name,

-		Aliases: []string{"kubectl"},

-		Short:   "Client tools for OpenShift",

-		Long:    fmt.Sprintf(longDesc, fullName),

+		Use:   name,

+		Short: "Client tools for OpenShift",

+		Long:  fmt.Sprintf(longDesc, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			c.SetOutput(os.Stdout)

 			c.Help()

 		},

 	}

-	// Override global default to https and port 8443

-	clientcmd.DefaultCluster.Server = defaultClusterURL

-

-	// TODO: there should be two client configs, one for OpenShift, and one for Kubernetes

-	clientConfig := DefaultClientConfig(cmds.PersistentFlags())

-	f := cmd.NewFactory(clientConfig)

-	f.BindFlags(cmds.PersistentFlags())

+	f := clientcmd.New(cmds.PersistentFlags())

 	out := os.Stdout

 	cmds.SetUsageTemplate(templates.CliUsageTemplate())

@@ -98,15 +90,18 @@ func NewCommandCLI(name, fullName string) *cobra.Command {

 // but with support for OpenShift resources

 func NewCmdKubectl(name string) *cobra.Command {

 	flags := pflag.NewFlagSet("", pflag.ContinueOnError)

-	clientcmd.DefaultCluster.Server = defaultClusterURL

-	clientConfig := DefaultClientConfig(flags)

-	f := cmd.NewFactory(clientConfig)

-	cmd := f.NewKubectlCommand(os.Stdout)

+	f := clientcmd.New(flags)

+	cmd := f.Factory.NewKubectlCommand(os.Stdout)

+	cmd.Aliases = []string{"kubectl"}

 	cmd.Use = name

 	cmd.Short = "Kubernetes cluster management via kubectl"

 	cmd.Long = cmd.Long + "\n\nThis command is provided for direct management of the Kubernetes cluster OpenShift runs on."

 	flags.VisitAll(func(flag *pflag.Flag) {

-		cmd.PersistentFlags().AddFlag(flag)

+		if f := cmd.PersistentFlags().Lookup(flag.Name); f == nil {

+			cmd.PersistentFlags().AddFlag(flag)

+		} else {

+			glog.V(6).Infof("already registered flag %s", flag.Name)

+		}

 	})

 	return cmd

 }

@@ -128,19 +123,3 @@ func applyToCreate(dst *cobra.Command) *cobra.Command {

 	}

 	return dst

 }

-

-// Copy of kubectl/cmd/DefaultClientConfig, using NewNonInteractiveDeferredLoadingClientConfig

-func DefaultClientConfig(flags *pflag.FlagSet) clientcmd.ClientConfig {

-	// TODO find and merge duplicates, this is also in other places

-	loadingRules := clientcmd.NewClientConfigLoadingRules()

-	loadingRules.EnvVarPath = os.Getenv(clientcmd.RecommendedConfigPathEnvVar)

-	flags.StringVar(&loadingRules.CommandLinePath, "kubeconfig", "", "Path to the kubeconfig file to use for CLI requests.")

-

-	overrides := &clientcmd.ConfigOverrides{}

-	overrideFlags := clientcmd.RecommendedConfigOverrideFlags("")

-	overrideFlags.ContextOverrideFlags.NamespaceShort = "n"

-	clientcmd.BindOverrideFlags(overrides, flags, overrideFlags)

-	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides)

-

-	return clientConfig

-}

@@ -5,9 +5,11 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"

 	"github.com/spf13/cobra"

+

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

-func NewCmdBuildLogs(f *Factory, out io.Writer) *cobra.Command {

+func NewCmdBuildLogs(f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:   "build-logs <build>",

 		Short: "Show container logs from the build container",

@@ -11,12 +11,13 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	"github.com/openshift/origin/pkg/build/util"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

 // NewCmdCancelBuild manages a build cancelling event.

 // To cancel a build its name has to be specified, and two options

 // are available: displaying logs and restarting.

-func NewCmdCancelBuild(f *Factory, out io.Writer) *cobra.Command {

+func NewCmdCancelBuild(f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:   "cancel-build <build>",

deleted file mode 100644

@@ -1,127 +0,0 @@

-package cmd

-

-import (

-	"fmt"

-

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"

-	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"

-	kubecmd "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

-	"github.com/spf13/cobra"

-

-	"github.com/openshift/origin/pkg/api/latest"

-	"github.com/openshift/origin/pkg/client"

-	"github.com/openshift/origin/pkg/cmd/cli/describe"

-)

-

-// Factory provides common options for OpenShift commands

-type Factory struct {

-	*kubecmd.Factory

-	OpenShiftClientConfig clientcmd.ClientConfig

-}

-

-// NewFactory creates an object that holds common methods across all OpenShift commands

-func NewFactory(clientConfig clientcmd.ClientConfig) *Factory {

-	mapper := ShortcutExpander{kubectl.ShortcutExpander{latest.RESTMapper}}

-

-	w := &Factory{kubecmd.NewFactory(clientConfig), clientConfig}

-

-	w.Object = func(cmd *cobra.Command) (meta.RESTMapper, runtime.ObjectTyper) {

-		return mapper, api.Scheme

-	}

-

-	// Save original RESTClient function

-	kRESTClientFunc := w.Factory.RESTClient

-	w.RESTClient = func(cmd *cobra.Command, mapping *meta.RESTMapping) (resource.RESTClient, error) {

-		if latest.OriginKind(mapping.Kind, mapping.APIVersion) {

-			cfg, err := w.OpenShiftClientConfig.ClientConfig()

-			if err != nil {

-				return nil, fmt.Errorf("unable to find client config %s: %v", mapping.Kind, err)

-			}

-			cli, err := client.New(cfg)

-			if err != nil {

-				return nil, fmt.Errorf("unable to create client %s: %v", mapping.Kind, err)

-			}

-			return cli.RESTClient, nil

-		}

-		return kRESTClientFunc(cmd, mapping)

-	}

-

-	// Save original Describer function

-	kDescriberFunc := w.Factory.Describer

-	w.Describer = func(cmd *cobra.Command, mapping *meta.RESTMapping) (kubectl.Describer, error) {

-		if latest.OriginKind(mapping.Kind, mapping.APIVersion) {

-			cfg, err := w.OpenShiftClientConfig.ClientConfig()

-			if err != nil {

-				return nil, fmt.Errorf("unable to describe %s: %v", mapping.Kind, err)

-			}

-			cli, err := client.New(cfg)

-			if err != nil {

-				return nil, fmt.Errorf("unable to describe %s: %v", mapping.Kind, err)

-			}

-			kubeClient, err := kclient.New(cfg)

-			if err != nil {

-				return nil, fmt.Errorf("unable to describe %s: %v", mapping.Kind, err)

-			}

-			describer, ok := describe.DescriberFor(mapping.Kind, cli, kubeClient, "")

-			if !ok {

-				return nil, fmt.Errorf("no description has been implemented for %q", mapping.Kind)

-			}

-			return describer, nil

-		}

-		return kDescriberFunc(cmd, mapping)

-	}

-

-	w.Printer = func(cmd *cobra.Command, mapping *meta.RESTMapping, noHeaders bool) (kubectl.ResourcePrinter, error) {

-		return describe.NewHumanReadablePrinter(noHeaders), nil

-	}

-

-	return w

-}

-

-// Clients returns an OpenShift and Kubernetes client.

-func (f *Factory) Clients(cmd *cobra.Command) (*client.Client, *kclient.Client, error) {

-	os, err := f.OpenShiftClientConfig.ClientConfig()

-	if err != nil {

-		return nil, nil, err

-	}

-	oc, err := client.New(os)

-	if err != nil {

-		return nil, nil, err

-	}

-	kc, err := f.Client(cmd)

-	if err != nil {

-		return nil, nil, err

-	}

-	return oc, kc, nil

-}

-

-// ShortcutExpander is a RESTMapper that can be used for OpenShift resources.

-type ShortcutExpander struct {

-	meta.RESTMapper

-}

-

-// VersionAndKindForResource implements meta.RESTMapper. It expands the resource first, then invokes the wrapped

-// mapper.

-func (e ShortcutExpander) VersionAndKindForResource(resource string) (defaultVersion, kind string, err error) {

-	resource = expandResourceShortcut(resource)

-	return e.RESTMapper.VersionAndKindForResource(resource)

-}

-

-// 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.

-func expandResourceShortcut(resource string) string {

-	shortForms := map[string]string{

-		"dc": "deploymentConfigs",

-		"bc": "buildConfigs",

-	}

-	if expanded, ok := shortForms[resource]; ok {

-		return expanded

-	}

-	return resource

-}

@@ -7,13 +7,14 @@ import (

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	dockerutil "github.com/openshift/origin/pkg/cmd/util/docker"

+	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"

 )

@@ -51,7 +52,7 @@ application is created.

 ALPHA: This command is under active development - feedback is appreciated.

 `

-func NewCmdNewApplication(f *Factory, out io.Writer) *cobra.Command {

+func NewCmdNewApplication(f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	config := newcmd.NewAppConfig()

 	helper := dockerutil.NewHelper()

@@ -107,32 +108,12 @@ func NewCmdNewApplication(f *Factory, out io.Writer) *cobra.Command {

 				return

 			}

-			mapper, typer := f.Object(c)

-			resourceMapper := &resource.Mapper{typer, mapper, f.Factory.ClientMapperForCommand(c)}

-			errs := []error{}

-			for i, item := range result.List.Items {

-				info, err := resourceMapper.InfoForObject(item)

-				if err != nil {

-					errs = append(errs, err)

-					continue

-				}

-				data, err := info.Mapping.Codec.Encode(item)

-				if err != nil {

-					errs = append(errs, err)

-					glog.Error(err)

-					continue

-				}

-				obj, err := resource.NewHelper(info.Client, info.Mapping).Create(namespace, false, data)

-				if err != nil {

-					errs = append(errs, err)

-					glog.Error(err)

-					continue

-				}

-				info.Refresh(obj, true)

-				result.List.Items[i] = obj

-				fmt.Fprintf(out, "%s\n", info.Name)

+			bulk := configcmd.Bulk{

+				Factory: f.Factory,

+				Command: c,

+				After:   configcmd.NewPrintNameOrErrorAfter(out, os.Stderr),

 			}

-			if len(errs) != 0 {

+			if errs := bulk.Create(result.List, namespace); len(errs) != 0 {

 				os.Exit(1)

 			}

@@ -6,9 +6,10 @@ import (

 	"github.com/spf13/cobra"

 	"github.com/openshift/origin/pkg/cmd/templates"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

-func NewCmdOptions(f *Factory, out io.Writer) *cobra.Command {

+func NewCmdOptions(f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use: "options",

 		Run: func(cmd *cobra.Command, args []string) {

@@ -10,6 +10,7 @@ import (

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	"github.com/openshift/origin/pkg/template"

 	"github.com/openshift/origin/pkg/template/api"

 )

@@ -35,7 +36,7 @@ func injectUserVars(cmd *cobra.Command, t *api.Template) {

 }

 // NewCmdProcess returns a 'process' command

-func NewCmdProcess(f *Factory, out io.Writer) *cobra.Command {

+func NewCmdProcess(f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:   "process -f filename",

 		Short: "Process template into list of resources",

@@ -9,6 +9,7 @@ import (

 	"github.com/spf13/cobra"

 	describe "github.com/openshift/origin/pkg/cmd/cli/describe"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 )

@@ -41,7 +42,7 @@ Examples:

   $ %[1]s %[2]s deployment-1 --output=json | %[1]s update deploymentConfigs deployment -f -

 `

-func NewCmdRollback(parentName string, name string, f *Factory, out io.Writer) *cobra.Command {

+func NewCmdRollback(parentName string, name string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	rollback := &deployapi.DeploymentConfigRollback{

 		Spec: deployapi.DeploymentConfigRollbackSpec{

 			IncludeTemplate: true,

@@ -11,9 +11,10 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	osclient "github.com/openshift/origin/pkg/client"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

-func NewCmdStartBuild(f *Factory, out io.Writer) *cobra.Command {

+func NewCmdStartBuild(f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:   "start-build (<buildConfig>|--from-build=<build>)",

 		Short: "Starts a new build from existing build or buildConfig",

@@ -15,8 +15,6 @@ import (

 	"github.com/openshift/origin/pkg/api/latest"

 	osclient "github.com/openshift/origin/pkg/client"

-	"github.com/openshift/origin/pkg/cmd/cli"

-	"github.com/openshift/origin/pkg/cmd/cli/cmd"

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	dh "github.com/openshift/origin/pkg/cmd/util/docker"

@@ -77,18 +75,16 @@ type params struct {

 	env cmdutil.Environment

 }

-func NewCmdGenerate(name string) *cobra.Command {

-	cfg := clientcmd.NewConfig()

+func NewCmdGenerate(f *clientcmd.Factory, parentName, name string) *cobra.Command {

 	dockerHelper := dh.NewHelper()

 	input := params{}

-	var factory *cmd.Factory

 	c := &cobra.Command{

 		Use:   fmt.Sprintf("%s%s", name, clientcmd.ConfigSyntax),

 		Short: "Generates an application configuration from a source repository",

 		Long:  longDescription,

 		Run: func(c *cobra.Command, args []string) {

-			_, osClient, err := cfg.Clients()

+			osClient, _, err := f.Clients(c)

 			if err != nil {

 				osClient = nil

 			}

@@ -116,7 +112,7 @@ func NewCmdGenerate(name string) *cobra.Command {

 				}

 				input.env = env

 			}

-			namespace, err := factory.DefaultNamespace(c)

+			namespace, err := f.DefaultNamespace(c)

 			if err != nil {

 				namespace = ""

 			}

@@ -127,9 +123,6 @@ func NewCmdGenerate(name string) *cobra.Command {

 			}

 		},

 	}

-	clientConfig := cli.DefaultClientConfig(c.PersistentFlags())

-	factory = cmd.NewFactory(clientConfig)

-	factory.BindFlags(c.PersistentFlags())

 	flag := c.Flags()

 	flag.StringVar(&input.name, "name", "", "Set name to use for generated application artifacts")

@@ -14,23 +14,18 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 	"github.com/openshift/origin/pkg/client"

-	"github.com/openshift/origin/pkg/cmd/cli/cmd"

 	"github.com/openshift/origin/pkg/cmd/flagtypes"

-	cmdutil "github.com/openshift/origin/pkg/cmd/util"

+	osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	"github.com/openshift/origin/pkg/cmd/util/tokencmd"

 )

-func NewCmdLogin(name string, parent *cobra.Command) *cobra.Command {

-	clientConfig := cmdutil.DefaultClientConfig(parent.PersistentFlags())

-	f := cmd.NewFactory(clientConfig)

-	f.BindFlags(parent.PersistentFlags())

-

+func NewCmdLogin(f *osclientcmd.Factory, parentName, name string) *cobra.Command {

 	cmds := &cobra.Command{

 		Use:   name,

 		Short: "Logs in and returns a session token",

 		Long: `Logs in to the OpenShift server and prints out a session token.

-Username and password can be provided through flags, the command will 

+Username and password can be provided through flags, the command will

 prompt for user input if not provided.

 `,

 		Run: func(cmd *cobra.Command, args []string) {

@@ -1,26 +1,26 @@

 package policy

 import (

-	"fmt"

-

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

 	"github.com/openshift/origin/pkg/client"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

 type addGroupOptions struct {

-	roleNamespace string

-	roleName      string

-	clientConfig  clientcmd.ClientConfig

+	roleNamespace    string

+	roleName         string

+	bindingNamespace string

+	client           client.Interface

 	groupNames []string

 }

-func NewCmdAddGroup(clientConfig clientcmd.ClientConfig) *cobra.Command {

-	options := &addGroupOptions{clientConfig: clientConfig}

+func NewCmdAddGroup(f *clientcmd.Factory) *cobra.Command {

+	options := &addGroupOptions{}

 	cmd := &cobra.Command{

 		Use:   "add-group <role> <group> [group]...",

@@ -31,9 +31,15 @@ func NewCmdAddGroup(clientConfig clientcmd.ClientConfig) *cobra.Command {

 				return

 			}

-			err := options.run()

-			if err != nil {

-				fmt.Printf("%v\n", err)

+			var err error

+			if options.client, _, err = f.Clients(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if options.bindingNamespace, err = f.DefaultNamespace(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if err := options.run(); err != nil {

+				glog.Fatal(err)

 			}

 		},

 	}

@@ -56,20 +62,7 @@ func (o *addGroupOptions) complete(cmd *cobra.Command) bool {

 }

 func (o *addGroupOptions) run() error {

-	clientConfig, err := o.clientConfig.ClientConfig()

-	if err != nil {

-		return err

-	}

-	client, err := client.New(clientConfig)

-	if err != nil {

-		return err

-	}

-	namespace, err := o.clientConfig.Namespace()

-	if err != nil {

-		return err

-	}

-

-	roleBindings, roleBindingNames, err := getExistingRoleBindingsForRole(o.roleNamespace, o.roleName, namespace, client)

+	roleBindings, roleBindingNames, err := getExistingRoleBindingsForRole(o.roleNamespace, o.roleName, o.bindingNamespace, o.client)

 	if err != nil {

 		return err

 	}

@@ -92,10 +85,10 @@ func (o *addGroupOptions) run() error {

 	roleBinding.GroupNames = groups.List()

 	if isUpdate {

-		_, err = client.RoleBindings(namespace).Update(roleBinding)

+		_, err = o.client.RoleBindings(o.bindingNamespace).Update(roleBinding)

 	} else {

 		roleBinding.Name = getUniqueName(o.roleName, roleBindingNames)

-		_, err = client.RoleBindings(namespace).Create(roleBinding)

+		_, err = o.client.RoleBindings(o.bindingNamespace).Create(roleBinding)

 	}

 	if err != nil {

 		return err

@@ -1,26 +1,26 @@

 package policy

 import (

-	"fmt"

-

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

 	"github.com/openshift/origin/pkg/client"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

 type addUserOptions struct {

-	roleNamespace string

-	roleName      string

-	clientConfig  clientcmd.ClientConfig

+	roleNamespace    string

+	roleName         string

+	bindingNamespace string

+	client           client.Interface

 	userNames []string

 }

-func NewCmdAddUser(clientConfig clientcmd.ClientConfig) *cobra.Command {

-	options := &addUserOptions{clientConfig: clientConfig}

+func NewCmdAddUser(f *clientcmd.Factory) *cobra.Command {

+	options := &addUserOptions{}

 	cmd := &cobra.Command{

 		Use:   "add-user <role> <user> [user]...",

@@ -31,9 +31,15 @@ func NewCmdAddUser(clientConfig clientcmd.ClientConfig) *cobra.Command {

 				return

 			}

-			err := options.run()

-			if err != nil {

-				fmt.Printf("%v\n", err)

+			var err error

+			if options.client, _, err = f.Clients(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if options.bindingNamespace, err = f.DefaultNamespace(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if err := options.run(); err != nil {

+				glog.Fatal(err)

 			}

 		},

 	}

@@ -56,20 +62,7 @@ func (o *addUserOptions) complete(cmd *cobra.Command) bool {

 }

 func (o *addUserOptions) run() error {

-	clientConfig, err := o.clientConfig.ClientConfig()

-	if err != nil {

-		return err

-	}

-	client, err := client.New(clientConfig)

-	if err != nil {

-		return err

-	}

-	namespace, err := o.clientConfig.Namespace()

-	if err != nil {

-		return err

-	}

-

-	roleBindings, roleBindingNames, err := getExistingRoleBindingsForRole(o.roleNamespace, o.roleName, namespace, client)

+	roleBindings, roleBindingNames, err := getExistingRoleBindingsForRole(o.roleNamespace, o.roleName, o.bindingNamespace, o.client)

 	if err != nil {

 		return err

 	}

@@ -92,10 +85,10 @@ func (o *addUserOptions) run() error {

 	roleBinding.UserNames = users.List()

 	if isUpdate {

-		_, err = client.RoleBindings(namespace).Update(roleBinding)

+		_, err = o.client.RoleBindings(o.bindingNamespace).Update(roleBinding)

 	} else {

 		roleBinding.Name = getUniqueName(o.roleName, roleBindingNames)

-		_, err = client.RoleBindings(namespace).Create(roleBinding)

+		_, err = o.client.RoleBindings(o.bindingNamespace).Create(roleBinding)

 	}

 	if err != nil {

 		return err

@@ -4,17 +4,16 @@ import (

 	"fmt"

 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

 	"github.com/openshift/origin/pkg/client"

-	cmdutil "github.com/openshift/origin/pkg/cmd/util"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

-func NewCommandPolicy(name string) *cobra.Command {

+func NewCommandPolicy(f *clientcmd.Factory, parentName, name string) *cobra.Command {

 	// Parent command to which all subcommands are added.

 	cmds := &cobra.Command{

 		Use:   name,

@@ -23,17 +22,13 @@ func NewCommandPolicy(name string) *cobra.Command {

 		Run:   runHelp,

 	}

-	// Override global default to https and port 8443

-	clientcmd.DefaultCluster.Server = "https://localhost:8443"

-	clientConfig := cmdutil.DefaultClientConfig(cmds.PersistentFlags())

-

-	cmds.AddCommand(NewCmdAddUser(clientConfig))

-	cmds.AddCommand(NewCmdRemoveUser(clientConfig))

-	cmds.AddCommand(NewCmdRemoveUserFromProject(clientConfig))

-	cmds.AddCommand(NewCmdAddGroup(clientConfig))

-	cmds.AddCommand(NewCmdRemoveGroup(clientConfig))

-	cmds.AddCommand(NewCmdRemoveGroupFromProject(clientConfig))

-	cmds.AddCommand(NewCmdWhoCan(clientConfig))

+	cmds.AddCommand(NewCmdAddUser(f))

+	cmds.AddCommand(NewCmdRemoveUser(f))

+	cmds.AddCommand(NewCmdRemoveUserFromProject(f))

+	cmds.AddCommand(NewCmdAddGroup(f))

+	cmds.AddCommand(NewCmdRemoveGroup(f))

+	cmds.AddCommand(NewCmdRemoveGroupFromProject(f))

+	cmds.AddCommand(NewCmdWhoCan(f))

 	return cmds

 }

@@ -65,7 +60,7 @@ func getUniqueName(basename string, existingNames *util.StringSet) string {

 	return string(util.NewUUID())

 }

-func getExistingRoleBindingsForRole(roleNamespace, role, bindingNamespace string, client *client.Client) ([]*authorizationapi.RoleBinding, *util.StringSet, error) {

+func getExistingRoleBindingsForRole(roleNamespace, role, bindingNamespace string, client client.Interface) ([]*authorizationapi.RoleBinding, *util.StringSet, error) {

 	existingBindings, err := client.PolicyBindings(bindingNamespace).Get(roleNamespace)

 	if err != nil && !strings.Contains(err.Error(), " not found") {

 		return nil, &util.StringSet{}, err

@@ -3,23 +3,25 @@ package policy

 import (

 	"fmt"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	"github.com/openshift/origin/pkg/client"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

 type removeGroupOptions struct {

-	roleNamespace string

-	roleName      string

-	clientConfig  clientcmd.ClientConfig

+	roleNamespace    string

+	roleName         string

+	bindingNamespace string

+	client           client.Interface

 	groupNames []string

 }

-func NewCmdRemoveGroup(clientConfig clientcmd.ClientConfig) *cobra.Command {

-	options := &removeGroupOptions{clientConfig: clientConfig}

+func NewCmdRemoveGroup(f *clientcmd.Factory) *cobra.Command {

+	options := &removeGroupOptions{}

 	cmd := &cobra.Command{

 		Use:   "remove-group <role> <group> [group]...",

@@ -30,9 +32,15 @@ func NewCmdRemoveGroup(clientConfig clientcmd.ClientConfig) *cobra.Command {

 				return

 			}

-			err := options.run()

-			if err != nil {

-				fmt.Printf("%v\n", err)

+			var err error

+			if options.client, _, err = f.Clients(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if options.bindingNamespace, err = f.DefaultNamespace(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if err := options.run(); err != nil {

+				glog.Fatal(err)

 			}

 		},

 	}

@@ -55,25 +63,12 @@ func (o *removeGroupOptions) complete(cmd *cobra.Command) bool {

 }

 func (o *removeGroupOptions) run() error {

-	clientConfig, err := o.clientConfig.ClientConfig()

-	if err != nil {

-		return err

-	}

-	client, err := client.New(clientConfig)

-	if err != nil {

-		return err

-	}

-	namespace, err := o.clientConfig.Namespace()

-	if err != nil {

-		return err

-	}

-

-	roleBindings, _, err := getExistingRoleBindingsForRole(o.roleNamespace, o.roleName, namespace, client)

+	roleBindings, _, err := getExistingRoleBindingsForRole(o.roleNamespace, o.roleName, o.bindingNamespace, o.client)

 	if err != nil {

 		return err

 	}

 	if len(roleBindings) == 0 {

-		return fmt.Errorf("unable to locate RoleBinding for %v::%v in %v", o.roleNamespace, o.roleName, namespace)

+		return fmt.Errorf("unable to locate RoleBinding for %v::%v in %v", o.roleNamespace, o.roleName, o.bindingNamespace)

 	}

 	for _, roleBinding := range roleBindings {

@@ -82,7 +77,7 @@ func (o *removeGroupOptions) run() error {

 		groups.Delete(o.groupNames...)

 		roleBinding.GroupNames = groups.List()

-		_, err = client.RoleBindings(namespace).Update(roleBinding)

+		_, err = o.client.RoleBindings(o.bindingNamespace).Update(roleBinding)

 		if err != nil {

 			return err

 		}

@@ -1,24 +1,24 @@

 package policy

 import (

-	"fmt"

-

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

-	klabels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

+	labels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	"github.com/openshift/origin/pkg/client"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

 type removeGroupFromProjectOptions struct {

-	clientConfig clientcmd.ClientConfig

+	bindingNamespace string

+	client           client.Interface

 	groupNames []string

 }

-func NewCmdRemoveGroupFromProject(clientConfig clientcmd.ClientConfig) *cobra.Command {

-	options := &removeGroupFromProjectOptions{clientConfig: clientConfig}

+func NewCmdRemoveGroupFromProject(f *clientcmd.Factory) *cobra.Command {

+	options := &removeGroupFromProjectOptions{}

 	cmd := &cobra.Command{

 		Use:   "remove-group-from-project  <group> [group]...",

@@ -29,9 +29,16 @@ func NewCmdRemoveGroupFromProject(clientConfig clientcmd.ClientConfig) *cobra.Co

 				return

 			}

-			err := options.run()

-			if err != nil {

-				fmt.Printf("%v\n", err)

+			var err error

+			if options.client, _, err = f.Clients(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+			if options.bindingNamespace, err = f.DefaultNamespace(cmd); err != nil {

+				glog.Fatalf("Error getting client: %v", err)

+			}

+

+			if err := options.run(); err != nil {

+				glog.Fatal(err)

 			}

 		},

 	}

@@ -51,20 +58,7 @@ func (o *removeGroupFromProjectOptions) complete(cmd *cobra.Command) bool {

 }