tweaks and rebase

openshift · Sep 8, 2017 · f8dfe5a · f8dfe5a
1 parent 5ab152d
commit f8dfe5a
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 78 deletions.
diff --git a/pkg/apps/apis/apps/install/apigroup.go b/pkg/apps/apis/apps/install/apigroup.go
diff --git a/pkg/apps/apis/apps/install/install.go b/pkg/apps/apis/apps/install/install.go
@@ -13,8 +13,8 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(deployapi.GroupName, deployapi.AddToSchemeInCoreGroup, deployapiv1.AddToSchemeInCoreGroup, sets.NewString(), kapi.Registry, kapi.Scheme)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/authorization/apis/authorization/install/install.go b/pkg/authorization/apis/authorization/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(authorizationapi.GroupName, authorizationapi.AddToSchemeInCoreGroup, authorizationapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("ClusterRole", "ClusterRoleBinding", "ClusterPolicy", "ClusterPolicyBinding"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/build/apis/build/install/install.go b/pkg/build/apis/build/install/install.go
@@ -13,8 +13,8 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(buildapi.GroupName, buildapi.AddToSchemeInCoreGroup, buildapiv1.AddToSchemeInCoreGroup, sets.NewString(), kapi.Registry, kapi.Scheme)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/image/apis/image/install/install.go b/pkg/image/apis/image/install/install.go
@@ -15,11 +15,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(imageapi.GroupName, imageapi.AddToSchemeInCoreGroup, imageapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("Image", "ImageSignature"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/network/apis/network/install/apigroup.go b/pkg/network/apis/network/install/apigroup.go
diff --git a/pkg/network/apis/network/install/install.go b/pkg/network/apis/network/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(sdnapi.GroupName, sdnapi.AddToSchemeInCoreGroup, sdnapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("ClusterNetwork", "HostSubnet", "NetNamespace"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/oauth/apis/oauth/install/install.go b/pkg/oauth/apis/oauth/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(oauthapi.GroupName, oauthapi.AddToSchemeInCoreGroup, oauthapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("OAuthAccessToken", "OAuthAuthorizeToken", "OAuthClient", "OAuthClientAuthorization"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/project/apis/project/install/install.go b/pkg/project/apis/project/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(projectapi.GroupName, projectapi.AddToSchemeInCoreGroup, projectapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("Project", "ProjectRequest"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/quota/apis/quota/install/install.go b/pkg/quota/apis/quota/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(quotaapi.GroupName, quotaapi.AddToSchemeInCoreGroup, quotaapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("ClusterResourceQuota"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/route/apis/route/install/install.go b/pkg/route/apis/route/install/install.go
@@ -13,8 +13,8 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(routeapi.GroupName, routeapi.AddToSchemeInCoreGroup, routeapiv1.AddToSchemeInCoreGroup, sets.NewString(), kapi.Registry, kapi.Scheme)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/template/apis/template/install/install.go b/pkg/template/apis/template/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(templateapi.GroupName, templateapi.AddToSchemeInCoreGroup, templateapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("BrokerTemplateInstance"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme

diff --git a/pkg/template/servicebroker/apis/config/install/install.go b/pkg/template/servicebroker/apis/config/install/install.go
@@ -9,15 +9,12 @@ import (
 	configapiv1 "github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1"
 )
 
-const importPrefix = "github.com/openshift/origin/pkg/authorization/apis/authorization"
-
 // Install registers the API group and adds types to a scheme
 func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
 	if err := announced.NewGroupMetaFactory(
 		&announced.GroupMetaFactoryArgs{
 			GroupName:                  configapi.GroupName,
 			VersionPreferenceOrder:     []string{configapiv1.SchemeGroupVersion.Version},
-			ImportPrefix:               importPrefix,
 			AddInternalObjectsToScheme: configapi.AddToScheme,
 		},
 		announced.VersionToSchemeFunc{

diff --git a/pkg/user/apis/user/install/install.go b/pkg/user/apis/user/install/install.go
@@ -13,11 +13,11 @@ import (
 )
 
 func init() {
-	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 	legacy.InstallLegacy(userapi.GroupName, userapi.AddToSchemeInCoreGroup, userapiv1.AddToSchemeInCoreGroup,
 		sets.NewString("User", "Identity", "UserIdentityMapping", "Group"),
 		kapi.Registry, kapi.Scheme,
 	)
+	Install(kapi.GroupFactoryRegistry, kapi.Registry, kapi.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme