ensure we never print a non-groupified object

pkg/api/legacygroupification/groupification.go

@@ -31,6 +31,15 @@ import (
 	"github.com/openshift/origin/pkg/user/apis/user"
 )
 
+func IsOAPI(gvk schema.GroupVersionKind) bool {
+	if len(gvk.Group) > 0 {
+		return false
+	}
+
+	_, ok := oapiKindsToGroup[gvk.Kind]
+	return ok
+}
+
 func OAPIToGroupifiedGVK(gvk *schema.GroupVersionKind) {
 	if len(gvk.Group) > 0 {
 		return
@@ -53,27 +62,32 @@ func OAPIToGroupified(uncast runtime.Object, gvk *schema.GroupVersionKind) {
 		newGroup := fixOAPIGroupKindInTopLevelUnstructured(obj.Object)
 		if len(newGroup) > 0 {
 			gvk.Group = newGroup
+			uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 		}
 	case *unstructured.UnstructuredList:
 		newGroup := fixOAPIGroupKindInTopLevelUnstructured(obj.Object)
 		if len(newGroup) > 0 {
 			gvk.Group = newGroup
+			uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 		}
 
 	case *apps.DeploymentConfig, *appsv1.DeploymentConfig, *apps.DeploymentConfigList, *appsv1.DeploymentConfigList,
 		*apps.DeploymentConfigRollback, *appsv1.DeploymentConfigRollback:
 		gvk.Group = apps.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *authorization.ClusterRoleBinding, *authorizationv1.ClusterRoleBinding, *authorization.ClusterRoleBindingList, *authorizationv1.ClusterRoleBindingList,
 		*authorization.ClusterRole, *authorizationv1.ClusterRole, *authorization.ClusterRoleList, *authorizationv1.ClusterRoleList,
 		*authorization.Role, *authorizationv1.Role, *authorization.RoleList, *authorizationv1.RoleList,
 		*authorization.RoleBinding, *authorizationv1.RoleBinding, *authorization.RoleBindingList, *authorizationv1.RoleBindingList,
 		*authorization.RoleBindingRestriction, *authorizationv1.RoleBindingRestriction, *authorization.RoleBindingRestrictionList, *authorizationv1.RoleBindingRestrictionList:
 		gvk.Group = authorization.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *build.BuildConfig, *buildv1.BuildConfig, *build.BuildConfigList, *buildv1.BuildConfigList,
 		*build.Build, *buildv1.Build, *build.BuildList, *buildv1.BuildList:
 		gvk.Group = build.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *image.Image, *imagev1.Image, *image.ImageList, *imagev1.ImageList,
 		*image.ImageSignature, *imagev1.ImageSignature,
@@ -83,43 +97,52 @@ func OAPIToGroupified(uncast runtime.Object, gvk *schema.GroupVersionKind) {
 		*image.ImageStream, *imagev1.ImageStream, *image.ImageStreamList, *imagev1.ImageStreamList,
 		*image.ImageStreamTag, *imagev1.ImageStreamTag:
 		gvk.Group = image.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *network.ClusterNetwork, *networkv1.ClusterNetwork, *network.ClusterNetworkList, *networkv1.ClusterNetworkList,
 		*network.NetNamespace, *networkv1.NetNamespace, *network.NetNamespaceList, *networkv1.NetNamespaceList,
 		*network.HostSubnet, *networkv1.HostSubnet, *network.HostSubnetList, *networkv1.HostSubnetList,
 		*network.EgressNetworkPolicy, *networkv1.EgressNetworkPolicy, *network.EgressNetworkPolicyList, *networkv1.EgressNetworkPolicyList:
 		gvk.Group = network.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *project.Project, *projectv1.Project, *project.ProjectList, *projectv1.ProjectList,
 		*project.ProjectRequest, *projectv1.ProjectRequest:
 		gvk.Group = project.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *quota.ClusterResourceQuota, *quotav1.ClusterResourceQuota, *quota.ClusterResourceQuotaList, *quotav1.ClusterResourceQuotaList:
 		gvk.Group = quota.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *oauth.OAuthAuthorizeToken, *oauthv1.OAuthAuthorizeToken, *oauth.OAuthAuthorizeTokenList, *oauthv1.OAuthAuthorizeTokenList,
 		*oauth.OAuthClientAuthorization, *oauthv1.OAuthClientAuthorization, *oauth.OAuthClientAuthorizationList, *oauthv1.OAuthClientAuthorizationList,
 		*oauth.OAuthClient, *oauthv1.OAuthClient, *oauth.OAuthClientList, *oauthv1.OAuthClientList,
 		*oauth.OAuthAccessToken, *oauthv1.OAuthAccessToken, *oauth.OAuthAccessTokenList, *oauthv1.OAuthAccessTokenList:
 		gvk.Group = oauth.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *route.Route, *routev1.Route, *route.RouteList, *routev1.RouteList:
 		gvk.Group = route.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *security.SecurityContextConstraints, *securityv1.SecurityContextConstraints, *security.SecurityContextConstraintsList, *securityv1.SecurityContextConstraintsList,
 		*security.PodSecurityPolicySubjectReview, *securityv1.PodSecurityPolicySubjectReview,
 		*security.PodSecurityPolicySelfSubjectReview, *securityv1.PodSecurityPolicySelfSubjectReview,
 		*security.PodSecurityPolicyReview, *securityv1.PodSecurityPolicyReview:
 		gvk.Group = security.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *template.Template, *templatev1.Template, *template.TemplateList, *templatev1.TemplateList:
 		gvk.Group = template.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *user.Group, *userv1.Group, *user.GroupList, *userv1.GroupList,
 		*user.Identity, *userv1.Identity, *user.IdentityList, *userv1.IdentityList,
 		*user.UserIdentityMapping, *userv1.UserIdentityMapping,
 		*user.User, *userv1.User, *user.UserList, *userv1.UserList:
 		gvk.Group = user.GroupName
+		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	}
 }

pkg/oc/cli/shim_kubectl.go

@@ -2,12 +2,10 @@ package cli
 
 import (
 	kclientcmd "k8s.io/client-go/tools/clientcmd"
-	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 	kcmdset "k8s.io/kubernetes/pkg/kubectl/cmd/set"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
-	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/openshiftpatch"
 	"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
 
 	"github.com/openshift/origin/pkg/api/legacygroupification"
@@ -18,13 +16,12 @@ import (
 func shimKubectlForOc() {
 	// we only need this change for `oc`.  `kubectl` should behave as close to `kubectl` as we can
 	// if we call this factory construction method, we want the openshift style config loading
-	genericclioptions.UseOpenShiftKubeConfigValues = true
 	kclientcmd.ErrEmptyConfig = genericclioptions.NewErrConfigurationMissing()
 	kcmdset.ParseDockerImageReferenceToStringFunc = clientcmd.ParseDockerImageReferenceToStringFunc
-	editor.UseOpenShiftEditorEnvVars = true
-	resource.OAPIToGroupified = legacygroupification.OAPIToGroupified
-	kcmd.OAPIToGroupifiedGVK = legacygroupification.OAPIToGroupifiedGVK
-	kcmd.UseOpenShiftGenerator = true
+	openshiftpatch.OAPIToGroupified = legacygroupification.OAPIToGroupified
+	openshiftpatch.OAPIToGroupifiedGVK = legacygroupification.OAPIToGroupifiedGVK
+	openshiftpatch.IsOAPIFn = legacygroupification.IsOAPI
+	openshiftpatch.IsOC = true
 
 	// update polymorphic helpers
 	polymorphichelpers.AttachablePodForObjectFn = originpolymorphichelpers.NewAttachablePodForObjectFn(polymorphichelpers.AttachablePodForObjectFn)