update register files

openshift · Nov 28, 2017 · d4db27a · d4db27a
1 parent e491d07
commit d4db27a
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 472 deletions.
diff --git a/pkg/apps/apis/apps/install/install.go b/pkg/apps/apis/apps/install/install.go
@@ -6,9 +6,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	deployapiv1 "github.com/openshift/api/apps/v1"
 	legacy "github.com/openshift/origin/pkg/api/legacy"
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 

diff --git a/pkg/apps/apis/apps/v1/register.go b/pkg/apps/apis/apps/v1/register.go
@@ -1,8 +1,7 @@
 package v1
 
 import (
-	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/openshift/api/apps/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -16,10 +15,10 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, RegisterDeepCopies, RegisterDefaults, RegisterConversions)
+	LegacySchemeBuilder    = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions)
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, RegisterDefaults)
+	SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 
 	localSchemeBuilder = &SchemeBuilder
@@ -28,33 +27,3 @@ var (
 func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
-
-// Adds the list of known types to api.Scheme.
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	types := []runtime.Object{
-		&DeploymentConfig{},
-		&DeploymentConfigList{},
-		&DeploymentConfigRollback{},
-		&DeploymentRequest{},
-		&DeploymentLog{},
-		&DeploymentLogOptions{},
-		&extensionsv1beta1.Scale{},
-	}
-	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
-	return nil
-}
-
-// Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&DeploymentConfig{},
-		&DeploymentConfigList{},
-		&DeploymentConfigRollback{},
-		&DeploymentRequest{},
-		&DeploymentLog{},
-		&DeploymentLogOptions{},
-		&extensionsv1beta1.Scale{},
-	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
-	return nil
-}
diff --git a/pkg/authorization/apis/authorization/install/install.go b/pkg/authorization/apis/authorization/install/install.go
@@ -7,10 +7,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	authorizationapiv1 "github.com/openshift/api/authorization/v1"
 	"github.com/openshift/origin/pkg/api/legacy"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	"github.com/openshift/origin/pkg/authorization/apis/authorization/rbacconversion"
+	authorizationapiv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
 )
 
 func init() {

diff --git a/pkg/authorization/apis/authorization/v1/register.go b/pkg/authorization/apis/authorization/v1/register.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/openshift/api/authorization/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -15,10 +15,10 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions)
+	LegacySchemeBuilder    = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions)
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
+	SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 
 	localSchemeBuilder = &SchemeBuilder
@@ -27,78 +27,3 @@ var (
 func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
-
-// Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&Role{},
-		&RoleBinding{},
-		&Policy{},
-		&PolicyBinding{},
-		&PolicyList{},
-		&PolicyBindingList{},
-		&RoleBindingList{},
-		&RoleList{},
-
-		&SelfSubjectRulesReview{},
-		&SubjectRulesReview{},
-		&ResourceAccessReview{},
-		&SubjectAccessReview{},
-		&LocalResourceAccessReview{},
-		&LocalSubjectAccessReview{},
-		&ResourceAccessReviewResponse{},
-		&SubjectAccessReviewResponse{},
-		&IsPersonalSubjectAccessReview{},
-
-		&ClusterRole{},
-		&ClusterRoleBinding{},
-		&ClusterPolicy{},
-		&ClusterPolicyBinding{},
-		&ClusterPolicyList{},
-		&ClusterPolicyBindingList{},
-		&ClusterRoleBindingList{},
-		&ClusterRoleList{},
-
-		&RoleBindingRestriction{},
-		&RoleBindingRestrictionList{},
-	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
-	return nil
-}
-
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	types := []runtime.Object{
-		&Role{},
-		&RoleBinding{},
-		&Policy{},
-		&PolicyBinding{},
-		&PolicyList{},
-		&PolicyBindingList{},
-		&RoleBindingList{},
-		&RoleList{},
-
-		&SelfSubjectRulesReview{},
-		&SubjectRulesReview{},
-		&ResourceAccessReview{},
-		&SubjectAccessReview{},
-		&LocalResourceAccessReview{},
-		&LocalSubjectAccessReview{},
-		&ResourceAccessReviewResponse{},
-		&SubjectAccessReviewResponse{},
-		&IsPersonalSubjectAccessReview{},
-
-		&ClusterRole{},
-		&ClusterRoleBinding{},
-		&ClusterPolicy{},
-		&ClusterPolicyBinding{},
-		&ClusterPolicyList{},
-		&ClusterPolicyBindingList{},
-		&ClusterRoleBindingList{},
-		&ClusterRoleList{},
-
-		&RoleBindingRestriction{},
-		&RoleBindingRestrictionList{},
-	}
-	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
-	return nil
-}
diff --git a/pkg/build/apis/build/install/install.go b/pkg/build/apis/build/install/install.go
@@ -6,9 +6,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	buildapiv1 "github.com/openshift/api/build/v1"
 	"github.com/openshift/origin/pkg/api/legacy"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
+	buildapiv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 

diff --git a/pkg/build/apis/build/v1/register.go b/pkg/build/apis/build/v1/register.go
@@ -1,8 +1,7 @@
 package v1
 
 import (
-	kapiv1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/openshift/api/build/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -14,10 +13,10 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions)
+	LegacySchemeBuilder    = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions)
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
+	SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 
 	localSchemeBuilder = &SchemeBuilder
@@ -37,38 +36,3 @@ func LegacyResource(resource string) schema.GroupResource {
 func IsResourceOrLegacy(resource string, gr schema.GroupResource) bool {
 	return gr == Resource(resource) || gr == LegacyResource(resource)
 }
-
-// addKnownTypes adds types to API group
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&Build{},
-		&BuildList{},
-		&BuildConfig{},
-		&BuildConfigList{},
-		&BuildLog{},
-		&BuildRequest{},
-		&BuildLogOptions{},
-		&BinaryBuildRequestOptions{},
-		// This is needed for webhooks
-		&kapiv1.PodProxyOptions{},
-	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
-	return nil
-}
-
-// addLegacyKnownTypes adds types to legacy API group
-// DEPRECATED: This will be deprecated and should not be modified.
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	types := []runtime.Object{
-		&Build{},
-		&BuildList{},
-		&BuildConfig{},
-		&BuildConfigList{},
-		&BuildLog{},
-		&BuildRequest{},
-		&BuildLogOptions{},
-		&BinaryBuildRequestOptions{},
-	}
-	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
-	return nil
-}
diff --git a/pkg/image/apis/image/docker10/register.go b/pkg/image/apis/image/docker10/register.go
@@ -15,24 +15,9 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "1.0"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "1.0"}
 
-	SchemeBuilder       = runtime.NewSchemeBuilder(addKnownTypes)
-	LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes)
+	SchemeBuilder       = runtime.NewSchemeBuilder()
+	LegacySchemeBuilder = runtime.NewSchemeBuilder()
 
 	AddToScheme            = SchemeBuilder.AddToScheme
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 )
-
-// Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&DockerImage{},
-	)
-	return nil
-}
-
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(LegacySchemeGroupVersion,
-		&DockerImage{},
-	)
-	return nil
-}
diff --git a/pkg/image/apis/image/dockerpre012/register.go b/pkg/image/apis/image/dockerpre012/register.go
@@ -1,6 +1,7 @@
 package dockerpre012
 
 import (
+	"github.com/openshift/api/image/dockerpre012"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -14,24 +15,9 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "pre012"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "pre012"}
 
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, RegisterDeepCopies)
+	SchemeBuilder = runtime.NewSchemeBuilder(addConversionFuncs, dockerpre012.RegisterDeepCopies)
 	AddToScheme   = SchemeBuilder.AddToScheme
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs)
+	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addConversionFuncs)
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 )
-
-// Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&DockerImage{},
-	)
-	return nil
-}
-
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(LegacySchemeGroupVersion,
-		&DockerImage{},
-	)
-	return nil
-}
diff --git a/pkg/image/apis/image/install/install.go b/pkg/image/apis/image/install/install.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/openshift/api/image/docker10"
 	"github.com/openshift/api/image/dockerpre012"
-	imageapiv1 "github.com/openshift/api/image/v1"
 	"github.com/openshift/origin/pkg/api/legacy"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	imageapiv1 "github.com/openshift/origin/pkg/image/apis/image/v1"
 )
 
 func init() {

diff --git a/pkg/image/apis/image/v1/register.go b/pkg/image/apis/image/v1/register.go
@@ -1,13 +1,12 @@
 package v1
 
 import (
-	kapiv1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/openshift/api/image/docker10"
 	"github.com/openshift/api/image/dockerpre012"
+	"github.com/openshift/api/image/v1"
 )
 
 const (
@@ -19,10 +18,10 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions, docker10.AddToSchemeInCoreGroup, dockerpre012.AddToSchemeInCoreGroup)
+	LegacySchemeBuilder    = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions, docker10.AddToSchemeInCoreGroup, dockerpre012.AddToSchemeInCoreGroup)
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults, docker10.AddToScheme, dockerpre012.AddToScheme)
+	SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults, docker10.AddToScheme, dockerpre012.AddToScheme)
 	AddToScheme   = SchemeBuilder.AddToScheme
 
 	localSchemeBuilder = &SchemeBuilder
@@ -31,40 +30,3 @@ var (
 func Resource(resource string) schema.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
-
-// Adds the list of known types to api.Scheme.
-func addLegacyKnownTypes(scheme *runtime.Scheme) error {
-	types := []runtime.Object{
-		&Image{},
-		&ImageList{},
-		&ImageSignature{},
-		&ImageStream{},
-		&ImageStreamList{},
-		&ImageStreamMapping{},
-		&ImageStreamTag{},
-		&ImageStreamTagList{},
-		&ImageStreamImage{},
-		&ImageStreamImport{},
-	}
-	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
-	return nil
-}
-
-// Adds the list of known types to api.Scheme.
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&Image{},
-		&ImageList{},
-		&ImageSignature{},
-		&ImageStream{},
-		&ImageStreamList{},
-		&ImageStreamMapping{},
-		&ImageStreamTag{},
-		&ImageStreamTagList{},
-		&ImageStreamImage{},
-		&ImageStreamImport{},
-		&kapiv1.SecretList{},
-	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
-	return nil
-}