@@ -1346,7 +1346,6 @@ _oadm_router()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--metrics-image=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -1355,20 +1354,10 @@ _oadm_router()

     flags+=("--secrets-as-env")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

     flags+=("--stats-password=")

     flags+=("--stats-port=")

     flags+=("--stats-user=")

     flags+=("--subdomain=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--api-version=")

     flags+=("--certificate-authority=")

@@ -1413,11 +1402,11 @@ _oadm_ipfailover()

     flags+=("--credentials=")

     flags_with_completion+=("--credentials")

     flags_completion+=("__handle_filename_extension_flag kubeconfig")

+    flags+=("--dry-run")

     flags+=("--images=")

     flags+=("--interface=")

     two_word_flags+=("-i")

     flags+=("--latest-images")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -1426,16 +1415,6 @@ _oadm_ipfailover()

     flags+=("--selector=")

     two_word_flags+=("-l")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--virtual-ips=")

     flags+=("--vrrp-id-offset=")

@@ -1489,7 +1468,6 @@ _oadm_registry()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--mount-host=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -1497,16 +1475,6 @@ _oadm_registry()

     flags+=("--replicas=")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--tls-certificate=")

     flags+=("--tls-key=")

     flags+=("--type=")

@@ -458,13 +458,9 @@ _oc_new-app()

     flags+=("--list")

     flags+=("-L")

     flags+=("--name=")

-    flags+=("--no-headers")

     flags+=("--no-install")

     flags+=("--output=")

     two_word_flags+=("-o")

-    flags+=("--output-template=")

-    flags_with_completion+=("--output-template")

-    flags_completion+=("_filedir")

     flags+=("--output-version=")

     flags+=("--param=")

     two_word_flags+=("-p")

@@ -751,24 +747,13 @@ _oc_new-build()

     flags+=("--labels=")

     two_word_flags+=("-l")

     flags+=("--name=")

-    flags+=("--no-headers")

     flags+=("--no-output")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

     flags+=("--source-image=")

     flags+=("--source-image-path=")

     flags+=("--strategy=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--to=")

     flags+=("--to-docker")

     flags+=("--api-version=")

@@ -4191,7 +4176,6 @@ _oc_adm_router()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--metrics-image=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -4200,20 +4184,10 @@ _oc_adm_router()

     flags+=("--secrets-as-env")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

     flags+=("--stats-password=")

     flags+=("--stats-port=")

     flags+=("--stats-user=")

     flags+=("--subdomain=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--api-version=")

     flags+=("--certificate-authority=")

@@ -4258,11 +4232,11 @@ _oc_adm_ipfailover()

     flags+=("--credentials=")

     flags_with_completion+=("--credentials")

     flags_completion+=("__handle_filename_extension_flag kubeconfig")

+    flags+=("--dry-run")

     flags+=("--images=")

     flags+=("--interface=")

     two_word_flags+=("-i")

     flags+=("--latest-images")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -4271,16 +4245,6 @@ _oc_adm_ipfailover()

     flags+=("--selector=")

     two_word_flags+=("-l")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--virtual-ips=")

     flags+=("--vrrp-id-offset=")

@@ -4334,7 +4298,6 @@ _oc_adm_registry()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--mount-host=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -4342,16 +4305,6 @@ _oc_adm_registry()

     flags+=("--replicas=")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--tls-certificate=")

     flags+=("--tls-key=")

     flags+=("--type=")

@@ -1921,7 +1921,6 @@ _openshift_admin_router()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--metrics-image=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -1930,20 +1929,10 @@ _openshift_admin_router()

     flags+=("--secrets-as-env")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

     flags+=("--stats-password=")

     flags+=("--stats-port=")

     flags+=("--stats-user=")

     flags+=("--subdomain=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--api-version=")

     flags+=("--certificate-authority=")

@@ -1988,11 +1977,11 @@ _openshift_admin_ipfailover()

     flags+=("--credentials=")

     flags_with_completion+=("--credentials")

     flags_completion+=("__handle_filename_extension_flag kubeconfig")

+    flags+=("--dry-run")

     flags+=("--images=")

     flags+=("--interface=")

     two_word_flags+=("-i")

     flags+=("--latest-images")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -2001,16 +1990,6 @@ _openshift_admin_ipfailover()

     flags+=("--selector=")

     two_word_flags+=("-l")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--virtual-ips=")

     flags+=("--vrrp-id-offset=")

@@ -2064,7 +2043,6 @@ _openshift_admin_registry()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--mount-host=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -2072,16 +2050,6 @@ _openshift_admin_registry()

     flags+=("--replicas=")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--tls-certificate=")

     flags+=("--tls-key=")

     flags+=("--type=")

@@ -4008,13 +3976,9 @@ _openshift_cli_new-app()

     flags+=("--list")

     flags+=("-L")

     flags+=("--name=")

-    flags+=("--no-headers")

     flags+=("--no-install")

     flags+=("--output=")

     two_word_flags+=("-o")

-    flags+=("--output-template=")

-    flags_with_completion+=("--output-template")

-    flags_completion+=("_filedir")

     flags+=("--output-version=")

     flags+=("--param=")

     two_word_flags+=("-p")

@@ -4301,24 +4265,13 @@ _openshift_cli_new-build()

     flags+=("--labels=")

     two_word_flags+=("-l")

     flags+=("--name=")

-    flags+=("--no-headers")

     flags+=("--no-output")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

     flags+=("--source-image=")

     flags+=("--source-image-path=")

     flags+=("--strategy=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--to=")

     flags+=("--to-docker")

     flags+=("--api-version=")

@@ -7741,7 +7694,6 @@ _openshift_cli_adm_router()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--metrics-image=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -7750,20 +7702,10 @@ _openshift_cli_adm_router()

     flags+=("--secrets-as-env")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

     flags+=("--stats-password=")

     flags+=("--stats-port=")

     flags+=("--stats-user=")

     flags+=("--subdomain=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--api-version=")

     flags+=("--certificate-authority=")

@@ -7808,11 +7750,11 @@ _openshift_cli_adm_ipfailover()

     flags+=("--credentials=")

     flags_with_completion+=("--credentials")

     flags_completion+=("__handle_filename_extension_flag kubeconfig")

+    flags+=("--dry-run")

     flags+=("--images=")

     flags+=("--interface=")

     two_word_flags+=("-i")

     flags+=("--latest-images")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -7821,16 +7763,6 @@ _openshift_cli_adm_ipfailover()

     flags+=("--selector=")

     two_word_flags+=("-l")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--virtual-ips=")

     flags+=("--vrrp-id-offset=")

@@ -7884,7 +7816,6 @@ _openshift_cli_adm_registry()

     flags+=("--labels=")

     flags+=("--latest-images")

     flags+=("--mount-host=")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -7892,16 +7823,6 @@ _openshift_cli_adm_registry()

     flags+=("--replicas=")

     flags+=("--selector=")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--tls-certificate=")

     flags+=("--tls-key=")

     flags+=("--type=")

@@ -14620,11 +14541,11 @@ _openshift_ex_ipfailover()

     flags+=("--credentials=")

     flags_with_completion+=("--credentials")

     flags_completion+=("__handle_filename_extension_flag kubeconfig")

+    flags+=("--dry-run")

     flags+=("--images=")

     flags+=("--interface=")

     two_word_flags+=("-i")

     flags+=("--latest-images")

-    flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     flags+=("--output-version=")

@@ -14633,16 +14554,6 @@ _openshift_ex_ipfailover()

     flags+=("--selector=")

     two_word_flags+=("-l")

     flags+=("--service-account=")

-    flags+=("--show-all")

-    flags+=("-a")

-    flags+=("--show-labels")

-    flags+=("--sort-by=")

-    flags+=("--template=")

-    flags_with_completion+=("--template")

-    flags_completion+=("_filedir")

-    two_word_flags+=("-t")

-    flags_with_completion+=("-t")

-    flags_completion+=("_filedir")

     flags+=("--type=")

     flags+=("--virtual-ips=")

     flags+=("--vrrp-id-offset=")

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

 	"k8s.io/kubernetes/pkg/api/validation"

 	"k8s.io/kubernetes/pkg/serviceaccount"

 	"k8s.io/kubernetes/pkg/util/sets"

-

 	// uservalidation "github.com/openshift/origin/pkg/user/api/validation"

 )

@@ -56,7 +56,7 @@ func NewCommandAdmin(name, fullName string, out io.Writer, errout io.Writer) *co

 			Message: "Install Commands:",

 			Commands: []*cobra.Command{

 				router.NewCmdRouter(f, fullName, "router", out),

-				exipfailover.NewCmdIPFailoverConfig(f, fullName, "ipfailover", out),

+				exipfailover.NewCmdIPFailoverConfig(f, fullName, "ipfailover", out, errout),

 				registry.NewCmdRegistry(f, fullName, "registry", out),

 			},

 		},

@@ -67,6 +67,8 @@ NOTE: This command is intended to simplify the tasks of setting up a Docker regi

 )

 type RegistryConfig struct {

+	Action configcmd.BulkAction

+

 	Name           string

 	Type           string

 	ImageTemplate  variable.ImageTemplate

@@ -89,8 +91,6 @@ type RegistryConfig struct {

 // randomSecretSize is the number of random bytes to generate.

 const randomSecretSize = 32

-var errExit = fmt.Errorf("exit")

-

 const (

 	defaultLabel = "docker-registry=default"

 	defaultPort  = 5000

@@ -128,7 +128,7 @@ func NewCmdRegistry(f *clientcmd.Factory, parentName, name string, out io.Writer

 		Example: fmt.Sprintf(registryExample, parentName, name),

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

 			err := RunCmdRegistry(f, cmd, out, cfg, args)

-			if err != errExit {

+			if err != cmdutil.ErrExit {

 				kcmdutil.CheckErr(err)

 			} else {

 				os.Exit(1)

@@ -144,7 +144,6 @@ func NewCmdRegistry(f *clientcmd.Factory, parentName, name string, out io.Writer

 	cmd.Flags().StringVar(&cfg.Labels, "labels", cfg.Labels, "A set of labels to uniquely identify the registry and its components.")

 	cmd.Flags().StringVar(&cfg.Volume, "volume", cfg.Volume, "The volume path to use for registry storage; defaults to /registry which is the default for origin-docker-registry.")

 	cmd.Flags().StringVar(&cfg.HostMount, "mount-host", cfg.HostMount, "If set, the registry volume will be created as a host-mount at this path.")

-	cmd.Flags().BoolVar(&cfg.DryRun, "dry-run", cfg.DryRun, "Check if the registry exists instead of creating.")

 	cmd.Flags().Bool("create", false, "deprecated; this is now the default behavior")

 	cmd.Flags().StringVar(&cfg.Credentials, "credentials", "", "Path to a .kubeconfig file that will contain the credentials the registry should use to contact the master.")

 	cmd.Flags().StringVar(&cfg.ServiceAccount, "service-account", cfg.ServiceAccount, "Name of the service account to use to run the registry pod.")

@@ -158,7 +157,8 @@ func NewCmdRegistry(f *clientcmd.Factory, parentName, name string, out io.Writer

 	// Deprecate credentials

 	cmd.Flags().MarkDeprecated("credentials", "use --service-account to specify the service account the registry will use to make API calls")

-	kcmdutil.AddPrinterFlags(cmd)

+	cfg.Action.BindForOutput(cmd.Flags())

+	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")

 	return cmd

 }

@@ -215,22 +215,27 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg

 		return fmt.Errorf("error getting client: %v", err)

 	}

-	_, output, err := kcmdutil.PrinterForCommand(cmd)

-	if err != nil {

-		return fmt.Errorf("unable to configure printer: %v", err)

-	}

+	cfg.Action.Bulk.Mapper = clientcmd.ResourceMapper(f)

+	cfg.Action.Out, cfg.Action.ErrOut = out, cmd.Out()

+	cfg.Action.Bulk.Op = configcmd.Create

 	var clusterIP string

-	generate := output

-	service, err := kClient.Services(namespace).Get(name)

-	if err != nil {

-		if !errors.IsNotFound(err) && !generate {

-			return fmt.Errorf("can't check for existing docker-registry %q: %v", name, err)

+	output := cfg.Action.ShouldPrint()

+	generate := output

+	if !generate {

+		service, err := kClient.Services(namespace).Get(name)

+		if err != nil {

+			if !errors.IsNotFound(err) && !generate {

+				return fmt.Errorf("can't check for existing docker-registry %q: %v", name, err)

+			}

+			if !output && cfg.Action.DryRun {

+				return fmt.Errorf("Docker registry %q service does not exist", name)

+			}

+			generate = true

+		} else {

+			clusterIP = service.Spec.ClusterIP

 		}

-		generate = true

-	} else {

-		clusterIP = service.Spec.ClusterIP

 	}

 	if !generate {

@@ -238,10 +243,6 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg

 		return nil

 	}

-	if cfg.DryRun && !output {

-		return fmt.Errorf("docker-registry %q does not exist (no service).", name)

-	}

-

 	// create new registry

 	secretEnv := app.Environment{}

 	switch {

@@ -404,7 +405,7 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg

 	// TODO: label all created objects with the same label

 	list := &kapi.List{Items: objects}

-	if output {

+	if cfg.Action.ShouldPrint() {

 		mapper, _ := f.Object(false)

 		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, out)

 		if err := fn(list); err != nil {

@@ -413,16 +414,8 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg

 		return nil

 	}

-	mapper, typer := f.Factory.Object(false)

-	bulk := configcmd.Bulk{

-		Mapper:            mapper,

-		Typer:             typer,

-		RESTClientFactory: f.Factory.ClientForMapping,

-

-		After: configcmd.NewPrintNameOrErrorAfter(mapper, kcmdutil.GetFlagString(cmd, "output") == "name", "created", out, cmd.Out()),

-	}

-	if errs := bulk.Create(list, namespace); len(errs) != 0 {

-		return errExit

+	if errs := cfg.Action.WithMessage(fmt.Sprintf("Creating registry %s", cfg.Name), "created").Run(list, namespace); len(errs) > 0 {

+		return cmdutil.ErrExit

 	}

 	return nil

 }

@@ -86,6 +86,8 @@ var defaultCertificatePath = path.Join(defaultCertificateDir, "tls.crt")

 // launch a router, including general parameters, type of router, and

 // type-specific parameters.

 type RouterConfig struct {

+	Action configcmd.BulkAction

+

 	// Name is the router name, set as an argument

 	Name string

@@ -247,7 +249,6 @@ func NewCmdRouter(f *clientcmd.Factory, parentName, name string, out io.Writer)

 	cmd.Flags().StringVar(&cfg.Ports, "ports", cfg.Ports, "A comma delimited list of ports or port pairs to expose on the router pod. The default is set for HAProxy. Port pairs are applied to the service and to host ports (if specified).")

 	cmd.Flags().IntVar(&cfg.Replicas, "replicas", cfg.Replicas, "The replication factor of the router; commonly 2 when high availability is desired.")

 	cmd.Flags().StringVar(&cfg.Labels, "labels", cfg.Labels, "A set of labels to uniquely identify the router and its components.")

-	cmd.Flags().BoolVar(&cfg.DryRun, "dry-run", cfg.DryRun, "Exit with code 1 if the specified router does not exist.")

 	cmd.Flags().BoolVar(&cfg.SecretsAsEnv, "secrets-as-env", cfg.SecretsAsEnv, "Use environment variables for master secrets.")

 	cmd.Flags().Bool("create", false, "deprecated; this is now the default behavior")

 	cmd.Flags().StringVar(&cfg.Credentials, "credentials", "", "Path to a .kubeconfig file that will contain the credentials the router should use to contact the master.")

@@ -276,7 +277,8 @@ func NewCmdRouter(f *clientcmd.Factory, parentName, name string, out io.Writer)

 	// Deprecate credentials

 	cmd.Flags().MarkDeprecated("credentials", "use --service-account to specify the service account the router will use to make API calls")

-	kcmdutil.AddPrinterFlags(cmd)

+	cfg.Action.BindForOutput(cmd.Flags())

+	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")

 	return cmd

 }

@@ -528,19 +530,26 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 		return fmt.Errorf("error getting client: %v", err)

 	}

-	_, output, err := kcmdutil.PrinterForCommand(cmd)

-	if err != nil {

-		return fmt.Errorf("unable to configure printer: %v", err)

-	}

+	cfg.Action.Bulk.Mapper = clientcmd.ResourceMapper(f)

+	cfg.Action.Out, cfg.Action.ErrOut = out, cmd.Out()

+	cfg.Action.Bulk.Op = configcmd.Create

+	var clusterIP string

+

+	output := cfg.Action.ShouldPrint()

 	generate := output

 	if !generate {

-		_, err = kClient.Services(namespace).Get(name)

+		service, err := kClient.Services(namespace).Get(name)

 		if err != nil {

 			if !errors.IsNotFound(err) {

 				return fmt.Errorf("can't check for existing router %q: %v", name, err)

 			}

+			if !output && cfg.Action.DryRun {

+				return fmt.Errorf("Router %q service does not exist", name)

+			}

 			generate = true

+		} else {

+			clusterIP = service.Spec.ClusterIP

 		}

 	}

 	if !generate {

@@ -548,17 +557,13 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 		return nil

 	}

-	if cfg.DryRun && !output {

-		return fmt.Errorf("router %q does not exist (no service)", name)

-	}

-

 	if len(cfg.ServiceAccount) == 0 {

 		return fmt.Errorf("you must specify a service account for the router with --service-account")

 	}

 	if err := validateServiceAccount(kClient, namespace, cfg.ServiceAccount, cfg.HostNetwork, cfg.HostPorts); err != nil {

 		err = fmt.Errorf("router could not be created; %v", err)

-		if !output {

+		if !cfg.Action.ShouldPrint() {

 			return err

 		}

 		fmt.Fprintf(cmd.Out(), "error: %v\n", err)

@@ -604,7 +609,7 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 	if len(cfg.StatsPassword) == 0 {

 		cfg.StatsPassword = generateStatsPassword()

-		if !output {

+		if !cfg.Action.ShouldPrint() {

 			fmt.Fprintf(cmd.Out(), "info: password for stats user %s has been set to %s\n", cfg.StatsUsername, cfg.StatsPassword)

 		}

 	}

@@ -735,6 +740,7 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 	for i := range objects {

 		switch t := objects[i].(type) {

 		case *kapi.Service:

+			t.Spec.ClusterIP = clusterIP

 			for j, servicePort := range t.Spec.Ports {

 				for _, targetPort := range ports {

 					if targetPort.ContainerPort == servicePort.Port && targetPort.HostPort != 0 {

@@ -747,7 +753,7 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 	// TODO: label all created objects with the same label - router=<name>

 	list := &kapi.List{Items: objects}

-	if output {

+	if cfg.Action.ShouldPrint() {

 		mapper, _ := f.Object(false)

 		fn := cmdutil.VersionedPrintObject(f.PrintObject, cmd, mapper, out)

 		if err := fn(list); err != nil {

@@ -756,15 +762,7 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 		return defaultOutputErr

 	}

-	mapper, typer := f.Factory.Object(false)

-	bulk := configcmd.Bulk{

-		Mapper:            mapper,

-		Typer:             typer,

-		RESTClientFactory: f.Factory.ClientForMapping,

-

-		After: configcmd.NewPrintNameOrErrorAfter(mapper, kcmdutil.GetFlagString(cmd, "output") == "name", "created", out, cmd.Out()),

-	}

-	if errs := bulk.Create(list, namespace); len(errs) != 0 {

+	if errs := cfg.Action.WithMessage(fmt.Sprintf("Creating router %s", cfg.Name), "created").Run(list, namespace); len(errs) > 0 {

 		return cmdutil.ErrExit

 	}

 	return nil

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

 	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

 	"k8s.io/kubernetes/pkg/kubectl/resource"

-	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util/errors"

 	"k8s.io/kubernetes/pkg/util/sets"

@@ -119,6 +118,7 @@ To search templates, image streams, and Docker images that match the arguments p

 )

 type NewAppOptions struct {

+	Action configcmd.BulkAction

 	Config *newcmd.AppConfig

 	CommandPath string

@@ -175,16 +175,9 @@ func NewCmdNewApplication(commandName string, f *clientcmd.Factory, out io.Write

 	cmd.Flags().BoolVar(&config.AllowMissingImageStreamTags, "allow-missing-imagestream-tags", false, "If true, indicates that image stream tags that don't exist should still be used.")

 	cmd.Flags().BoolVar(&config.AllowSecretUse, "grant-install-rights", false, "If true, a component that requires access to your account may use your token to install software into your project. Only grant images you trust the right to run with your token.")

 	cmd.Flags().BoolVar(&config.SkipGeneration, "no-install", false, "Do not attempt to run images that describe themselves as being installable")

-	cmd.Flags().BoolVar(&config.DryRun, "dry-run", false, "If true, do not actually create resources.")

-	// TODO AddPrinterFlags disabled so that it doesn't conflict with our own "template" flag.

-	// Need a better solution.

-	// kcmdutil.AddPrinterFlags(cmd)

-	cmd.Flags().StringP("output", "o", "", "Output format. One of: json|yaml|template|templatefile.")

-	cmd.Flags().String("output-version", "", "Output the formatted object with the given version (default api-version).")

-	cmd.Flags().Bool("no-headers", false, "When using the default output, don't print headers.")

-	cmd.Flags().String("output-template", "", "Template string or path to template file to use when -o=template or -o=templatefile.  The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]")

-	cmd.MarkFlagFilename("output-template")

+	options.Action.BindForOutput(cmd.Flags())

+	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")

 	return cmd

 }

@@ -203,6 +196,15 @@ func (o *NewAppOptions) Complete(commandName string, f *clientcmd.Factory, c *co

 	}

 	o.Config.ErrOut = o.ErrOut

+	o.Action.Out, o.Action.ErrOut = o.Out, o.ErrOut

+	o.Action.Bulk.Mapper = clientcmd.ResourceMapper(f)

+	o.Action.Bulk.Op = configcmd.Create

+	// Retry is used to support previous versions of the API server that will

+	// consider the presence of an unknown trigger type to be an error.

+	o.Action.Bulk.Retry = retryBuildConfig

+

+	o.Config.DryRun = o.Action.DryRun

+

 	o.CommandPath = c.CommandPath()

 	o.CommandName = commandName

 	mapper, _ := f.Object(false)

@@ -221,8 +223,6 @@ func (o *NewAppOptions) Complete(commandName string, f *clientcmd.Factory, c *co

 func (o *NewAppOptions) Run() error {

 	config := o.Config

 	out := o.Out

-	output := o.Output

-	shortOutput := output == "name"

 	if config.Querying() {

 		result, err := config.RunQuery()

@@ -230,7 +230,7 @@ func (o *NewAppOptions) Run() error {

 			return handleRunError(err, o.CommandName, o.CommandPath)

 		}

-		if len(output) != 0 {

+		if o.Action.ShouldPrint() {

 			return o.PrintObject(result.List)

 		}

@@ -258,44 +258,25 @@ func (o *NewAppOptions) Run() error {

 		return err

 	}

-	indent := "    "

-	switch {

-	case shortOutput:

-		indent = ""

-	case len(output) != 0:

+	if o.Action.ShouldPrint() {

 		return o.PrintObject(result.List)

-	case !result.GeneratedJobs:

-		if len(config.Labels) > 0 {

-			fmt.Fprintf(out, "--> Creating resources with label %s ...\n", labels.SelectorFromSet(config.Labels).String())

-		} else {

-			fmt.Fprintf(out, "--> Creating resources ...\n")

-		}

-	}

-	if config.DryRun {

-		fmt.Fprintf(out, "--> Success (DRY RUN)\n")

-		return nil

 	}

-	var afterFn configcmd.AfterFunc

-	switch {

-	// only print success if we don't have installables

-	case !result.GeneratedJobs:

-		afterFn = configcmd.NewPrintNameOrErrorAfterIndent(config.Mapper, shortOutput, "created", out, config.ErrOut, indent)

-	default:

-		afterFn = configcmd.NewPrintErrorAfter(config.Mapper, config.ErrOut)

-		afterFn = configcmd.HaltOnError(afterFn)

+	if result.GeneratedJobs {

+		o.Action.Compact()

 	}

-	if err := createObjects(config, afterFn, result); err != nil {

-		return err

+	if errs := o.Action.WithMessage(configcmd.CreateMessage(config.Labels), "created").Run(result.List, result.Namespace); len(errs) > 0 {

+		return cmdutil.ErrExit

 	}

-	if !shortOutput && !result.GeneratedJobs {

-		fmt.Fprintf(out, "--> Success\n")

+	if !o.Action.Verbose() || o.Action.DryRun {

+		return nil

 	}

 	hasMissingRepo := false

 	installing := []*kapi.Pod{}

+	indent := o.Action.DefaultIndent()

 	for _, item := range result.List.Items {

 		switch t := item.(type) {

 		case *kapi.Pod:

@@ -327,10 +308,6 @@ func (o *NewAppOptions) Run() error {

 		}

 	}

-	if shortOutput {

-		return nil

-	}

-

 	switch {

 	case len(installing) == 1:

 		jobInput := installing[0].Annotations[newcmd.GeneratedForJobFor]

@@ -574,23 +551,6 @@ func retryBuildConfig(info *resource.Info, err error) runtime.Object {

 	return nil

 }

-func createObjects(config *newcmd.AppConfig, after configcmd.AfterFunc, result *newcmd.AppResult) error {

-	bulk := configcmd.Bulk{

-		Mapper:            config.Mapper,

-		Typer:             config.Typer,

-		RESTClientFactory: config.ClientMapper.ClientForMapping,

-

-		After: after,

-		// Retry is used to support previous versions of the API server that will

-		// consider the presence of an unknown trigger type to be an error.

-		Retry: retryBuildConfig,

-	}

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

-		return cmdutil.ErrExit

-	}

-	return nil

-}

-

 func handleRunError(err error, commandName, commandPath string) error {

 	if err == nil {

 		return nil

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

 	configcmd "github.com/openshift/origin/pkg/config/cmd"

 	newapp "github.com/openshift/origin/pkg/generate/app"

 	newcmd "github.com/openshift/origin/pkg/generate/app/cmd"

-	"k8s.io/kubernetes/pkg/labels"

 )

 const (

@@ -80,6 +79,7 @@ on the Docker Hub.

 )

 type NewBuildOptions struct {

+	Action configcmd.BulkAction

 	Config *newcmd.AppConfig

 	CommandPath string

@@ -131,11 +131,12 @@ func NewCmdNewBuild(fullName string, f *clientcmd.Factory, in io.Reader, out io.

 	cmd.Flags().BoolVar(&config.AllowMissingImages, "allow-missing-images", false, "If true, indicates that referenced Docker images that cannot be found locally or in a registry should still be used.")

 	cmd.Flags().BoolVar(&config.AllowMissingImageStreamTags, "allow-missing-imagestream-tags", false, "If true, indicates that image stream tags that don't exist should still be used.")

 	cmd.Flags().StringVar(&config.ContextDir, "context-dir", "", "Context directory to be used for the build.")

-	cmd.Flags().BoolVar(&config.DryRun, "dry-run", false, "If true, do not actually create resources.")

 	cmd.Flags().BoolVar(&config.NoOutput, "no-output", false, "If true, the build output will not be pushed anywhere.")

 	cmd.Flags().StringVar(&config.SourceImage, "source-image", "", "Specify an image to use as source for the build.  You must also specify --source-image-path.")

 	cmd.Flags().StringVar(&config.SourceImagePath, "source-image-path", "", "Specify the file or directory to copy from the source image and its destination in the build directory. Format: [source]:[destination-dir].")