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

 	"github.com/openshift/origin/pkg/cmd/admin/groups/sync/interfaces"

 	"github.com/openshift/origin/pkg/cmd/server/api"

 	"github.com/openshift/origin/pkg/cmd/server/api/validation"

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

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

 )

@@ -385,6 +386,11 @@ func (o *SyncOptions) Run(cmd *cobra.Command, f *clientcmd.Factory) error {

 	for _, item := range openshiftGroups {

 		list.Items = append(list.Items, item)

 	}

+	list.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(cmd, list.Items)

+	if err != nil {

+		return err

+	}

+

 	if err := f.Factory.PrintObject(cmd, list, o.Out); err != nil {

 		return err

 	}

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

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

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

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

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

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

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

 )

@@ -144,6 +145,10 @@ func (o *ReconcileClusterRoleBindingsOptions) RunReconcileClusterRoleBindings(cm

 		for _, item := range changedClusterRoleBindings {

 			list.Items = append(list.Items, item)

 		}

+		list.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(cmd, list.Items)

+		if err != nil {

+			return err

+		}

 		if err := f.Factory.PrintObject(cmd, list, o.Out); err != nil {

 			return err

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

 	"github.com/openshift/origin/pkg/authorization/rulevalidation"

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

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

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

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

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

 )

@@ -145,6 +146,11 @@ func (o *ReconcileClusterRolesOptions) RunReconcileClusterRoles(cmd *cobra.Comma

 			list.Items = append(list.Items, item)

 		}

+		list.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(cmd, list.Items)

+		if err != nil {

+			return err

+		}

+

 		if err := f.Factory.PrintObject(cmd, list, o.Out); err != nil {

 			return err

 		}

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

 	"errors"

 	"fmt"

 	"io"

+	"sort"

 	"github.com/spf13/cobra"

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

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

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

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

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

-	"sort"

 )

 // ReconcileSCCRecommendedName is the recommended command name

@@ -149,6 +150,11 @@ func (o *ReconcileSCCOptions) RunReconcileSCCs(cmd *cobra.Command, f *clientcmd.

 		for _, item := range changedSCCs {

 			list.Items = append(list.Items, item)

 		}

+		list.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(cmd, list.Items)

+		if err != nil {

+			return err

+		}

+

 		if err := f.Factory.PrintObject(cmd, list, o.Out); err != nil {

 			return err

 		}

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

 	"k8s.io/kubernetes/pkg/runtime"

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

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

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

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

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

@@ -336,6 +337,11 @@ func RunCmdRegistry(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg

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

 		if output {

+			list.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(cmd, list.Items)

+			if err != nil {

+				return err

+			}

+

 			if err := f.PrintObject(cmd, list, out); err != nil {

 				return fmt.Errorf("unable to print object: %v", err)

 			}

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

 	"k8s.io/kubernetes/pkg/serviceaccount"

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

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

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

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

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

@@ -622,6 +623,11 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

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

 		if output {

+			list.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(cmd, list.Items)

+			if err != nil {

+				return err

+			}

+

 			if err := f.PrintObject(cmd, list, out); err != nil {

 				return fmt.Errorf("Unable to print object: %v", err)

 			}

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

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

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

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

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

@@ -190,6 +191,11 @@ func RunNewApplication(fullName string, f *clientcmd.Factory, out io.Writer, c *

 		}

 		if len(output) != 0 {

+			result.List.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(c, result.List.Items)

+			if err != nil {

+				return err

+			}

+

 			return f.Factory.PrintObject(c, result.List, out)

 		}

@@ -220,6 +226,11 @@ func RunNewApplication(fullName string, f *clientcmd.Factory, out io.Writer, c *

 	case shortOutput:

 		indent = ""

 	case len(output) != 0:

+		result.List.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(c, result.List.Items)

+		if err != nil {

+			return err

+		}

+

 		return f.Factory.PrintObject(c, result.List, out)

 	case !result.GeneratedJobs:

 		if len(config.Labels) > 0 {

@@ -9,12 +9,14 @@ import (

 	. "github.com/MakeNowJust/heredoc/dot"

 	"github.com/spf13/cobra"

+

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

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

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

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

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

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

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

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

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

@@ -168,6 +170,11 @@ func RunNewBuild(fullName string, f *clientcmd.Factory, out io.Writer, in io.Rea

 	case shortOutput:

 		indent = ""

 	case len(output) != 0:

+		result.List.Items, err = ocmdutil.ConvertItemsForDisplayFromDefaultCommand(c, result.List.Items)

+		if err != nil {

+			return err

+		}

+

 		return f.Factory.PrintObject(c, result.List, out)

 	default:

 		if len(config.Labels) > 0 {

@@ -1,4 +1,4 @@

-package bootstrappolicy

+package bootstrappolicy_test

 import (

 	"fmt"

@@ -12,10 +12,14 @@ import (

 	"k8s.io/kubernetes/pkg/util"

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

+	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

 )

 func TestOpenshiftRoles(t *testing.T) {

-	roles := GetBootstrapOpenshiftRoles("openshift")

+	roles := bootstrappolicy.GetBootstrapOpenshiftRoles("openshift")

 	list := &api.List{}

 	for i := range roles {

 		list.Items = append(list.Items, &roles[i])

@@ -24,7 +28,7 @@ func TestOpenshiftRoles(t *testing.T) {

 }

 func TestBootstrapProjectRoleBindings(t *testing.T) {

-	roleBindings := GetBootstrapServiceAccountProjectRoleBindings("myproject")

+	roleBindings := bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings("myproject")

 	list := &api.List{}

 	for i := range roleBindings {

 		list.Items = append(list.Items, &roleBindings[i])

@@ -33,7 +37,7 @@ func TestBootstrapProjectRoleBindings(t *testing.T) {

 }

 func TestBootstrapClusterRoleBindings(t *testing.T) {

-	roleBindings := GetBootstrapClusterRoleBindings()

+	roleBindings := bootstrappolicy.GetBootstrapClusterRoleBindings()

 	list := &api.List{}

 	for i := range roleBindings {

 		list.Items = append(list.Items, &roleBindings[i])

@@ -42,7 +46,7 @@ func TestBootstrapClusterRoleBindings(t *testing.T) {

 }

 func TestBootstrapClusterRoles(t *testing.T) {

-	roles := GetBootstrapClusterRoles()

+	roles := bootstrappolicy.GetBootstrapClusterRoles()

 	list := &api.List{}

 	for i := range roles {

 		list.Items = append(list.Items, &roles[i])

@@ -57,7 +61,11 @@ func testObjects(t *testing.T, list *api.List, fixtureFilename string) {

 		t.Fatal(err)

 	}

-	jsonData, err := v1.Codec.Encode(list)

+	if err := runtime.EncodeList(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), list.Items); err != nil {

+		t.Fatal(err)

+	}

+

+	jsonData, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), list)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -9,9 +9,12 @@ import (

 	"github.com/spf13/cobra"

+	kapi "k8s.io/kubernetes/pkg/api"

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

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

+	"k8s.io/kubernetes/pkg/apimachinery/registered"

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

+	"k8s.io/kubernetes/pkg/runtime"

 )

 // ErrExit is a marker interface for cli commands indicating that the response has been processed

@@ -64,3 +67,59 @@ func ResolveResource(defaultResource, resourceString string, mapper meta.RESTMap

 	return defaultResource, name, nil

 }

+

+// ConvertItemsForDisplay returns a new list that contains parallel elements that have been converted to the most preferred external version

+func ConvertItemsForDisplay(objs []runtime.Object, preferredVersions ...unversioned.GroupVersion) ([]runtime.Object, error) {

+	ret := []runtime.Object{}

+

+	for i := range objs {

+		obj := objs[i]

+		kind, err := kapi.Scheme.ObjectKind(obj)

+		if err != nil {

+			return nil, err

+		}

+		groupMeta, err := registered.Group(kind.Group)

+		if err != nil {

+			return nil, err

+		}

+

+		requestedVersion := unversioned.GroupVersion{}

+		for _, preferredVersion := range preferredVersions {

+			if preferredVersion.Group == kind.Group {

+				requestedVersion = preferredVersion

+				break

+			}

+		}

+

+		actualOutputVersion := unversioned.GroupVersion{}

+		for _, externalVersion := range groupMeta.GroupVersions {

+			if externalVersion == requestedVersion {

+				actualOutputVersion = externalVersion

+				break

+			}

+			if actualOutputVersion.IsEmpty() {

+				actualOutputVersion = externalVersion

+			}

+		}

+

+		convertedObject, err := kapi.Scheme.ConvertToVersion(obj, actualOutputVersion.String())

+		if err != nil {

+			return nil, err

+		}

+

+		ret = append(ret, convertedObject)

+	}

+

+	return ret, nil

+}

+

+// ConvertItemsForDisplayFromDefaultCommand returns a new list that contains parallel elements that have been converted to the most preferred external version

+func ConvertItemsForDisplayFromDefaultCommand(cmd *cobra.Command, objs []runtime.Object) ([]runtime.Object, error) {

+	requestedOutputVersionString := kcmdutil.GetFlagString(cmd, "output-version")

+	requestedOutputVersion, err := unversioned.ParseGroupVersion(requestedOutputVersionString)

+	if err != nil {

+		return nil, err

+	}

+

+	return ConvertItemsForDisplay(objs, requestedOutputVersion)

+}