diff --git a/pkg/apps/apis/apps/install/install.go b/pkg/apps/apis/apps/install/install.go index 6c7a77911e25..142c7e5efd0f 100644 --- 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 index 56c0f885f8b3..9a091d29eb41 100644 --- 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 index 53f712be2e20..cf6bd6d282be 100644 --- 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 index 55dc004880ea..0d725c4d1735 100644 --- 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 index 685973ebf038..32764b23c243 100644 --- 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 index 03aea0f6ca67..26c252750c5a 100644 --- 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 index 31d616a06c0c..8704f9499410 100644 --- 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 index 92051be4e105..c7f336b0ca15 100644 --- 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 index d51d675a0aed..6c0d3921563e 100644 --- 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 index 060ff33a992a..264f86cd3ada 100644 --- 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 -} diff --git a/pkg/network/apis/network/install/install.go b/pkg/network/apis/network/install/install.go index 08eaf39c67c9..7701e874cf22 100644 --- a/pkg/network/apis/network/install/install.go +++ b/pkg/network/apis/network/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - sdnapiv1 "github.com/openshift/api/network/v1" "github.com/openshift/origin/pkg/api/legacy" sdnapi "github.com/openshift/origin/pkg/network/apis/network" + sdnapiv1 "github.com/openshift/origin/pkg/network/apis/network/v1" ) func init() { diff --git a/pkg/network/apis/network/v1/register.go b/pkg/network/apis/network/v1/register.go index e8cebd898c1c..71549af2e149 100644 --- a/pkg/network/apis/network/v1/register.go +++ b/pkg/network/apis/network/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/network/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,10 @@ var ( SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"} - LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, RegisterDeepCopies, RegisterDefaults, RegisterConversions) + LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions) AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -28,35 +28,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, - &ClusterNetwork{}, - &ClusterNetworkList{}, - &HostSubnet{}, - &HostSubnetList{}, - &NetNamespace{}, - &NetNamespaceList{}, - &EgressNetworkPolicy{}, - &EgressNetworkPolicyList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -// Adds the list of known types to api.Scheme. -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &ClusterNetwork{}, - &ClusterNetworkList{}, - &HostSubnet{}, - &HostSubnetList{}, - &NetNamespace{}, - &NetNamespaceList{}, - &EgressNetworkPolicy{}, - &EgressNetworkPolicyList{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -} diff --git a/pkg/oauth/apis/oauth/install/install.go b/pkg/oauth/apis/oauth/install/install.go index 856596a3829c..9b0fcf1806de 100644 --- a/pkg/oauth/apis/oauth/install/install.go +++ b/pkg/oauth/apis/oauth/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - oauthapiv1 "github.com/openshift/api/oauth/v1" "github.com/openshift/origin/pkg/api/legacy" oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth" + oauthapiv1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1" ) func init() { diff --git a/pkg/oauth/apis/oauth/v1/register.go b/pkg/oauth/apis/oauth/v1/register.go index 3d9493784a0c..2a39a8ac7f19 100644 --- a/pkg/oauth/apis/oauth/v1/register.go +++ b/pkg/oauth/apis/oauth/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/oauth/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,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 @@ -28,36 +28,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, - &OAuthAccessToken{}, - &OAuthAccessTokenList{}, - &OAuthAuthorizeToken{}, - &OAuthAuthorizeTokenList{}, - &OAuthClient{}, - &OAuthClientList{}, - &OAuthClientAuthorization{}, - &OAuthClientAuthorizationList{}, - &OAuthRedirectReference{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &OAuthAccessToken{}, - &OAuthAccessTokenList{}, - &OAuthAuthorizeToken{}, - &OAuthAuthorizeTokenList{}, - &OAuthClient{}, - &OAuthClientList{}, - &OAuthClientAuthorization{}, - &OAuthClientAuthorizationList{}, - &OAuthRedirectReference{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -} diff --git a/pkg/project/apis/project/install/install.go b/pkg/project/apis/project/install/install.go index 4d1df8716475..69178609c3e3 100644 --- a/pkg/project/apis/project/install/install.go +++ b/pkg/project/apis/project/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - projectapiv1 "github.com/openshift/api/project/v1" "github.com/openshift/origin/pkg/api/legacy" projectapi "github.com/openshift/origin/pkg/project/apis/project" + projectapiv1 "github.com/openshift/origin/pkg/project/apis/project/v1" ) func init() { diff --git a/pkg/project/apis/project/v1/register.go b/pkg/project/apis/project/v1/register.go index e447e2a73ebe..ed933d974010 100644 --- a/pkg/project/apis/project/v1/register.go +++ b/pkg/project/apis/project/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/project/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,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) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -28,24 +28,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, - &Project{}, - &ProjectList{}, - &ProjectRequest{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &Project{}, - &ProjectList{}, - &ProjectRequest{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -} diff --git a/pkg/quota/apis/quota/install/install.go b/pkg/quota/apis/quota/install/install.go index 22bca60381ce..58a240997562 100644 --- a/pkg/quota/apis/quota/install/install.go +++ b/pkg/quota/apis/quota/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - quotaapiv1 "github.com/openshift/api/quota/v1" "github.com/openshift/origin/pkg/api/legacy" quotaapi "github.com/openshift/origin/pkg/quota/apis/quota" + quotaapiv1 "github.com/openshift/origin/pkg/quota/apis/quota/v1" ) func init() { diff --git a/pkg/quota/apis/quota/v1/register.go b/pkg/quota/apis/quota/v1/register.go index 977f89cd5739..c0ff2f1ce194 100644 --- a/pkg/quota/apis/quota/v1/register.go +++ b/pkg/quota/apis/quota/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/quota/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,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) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -34,26 +34,3 @@ func Kind(kind string) schema.GroupKind { 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, - &ClusterResourceQuota{}, - &ClusterResourceQuotaList{}, - &AppliedClusterResourceQuota{}, - &AppliedClusterResourceQuotaList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &ClusterResourceQuota{}, - &ClusterResourceQuotaList{}, - &AppliedClusterResourceQuota{}, - &AppliedClusterResourceQuotaList{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -} diff --git a/pkg/route/apis/route/install/install.go b/pkg/route/apis/route/install/install.go index 563f27d61c1f..5ec289c61eb1 100644 --- a/pkg/route/apis/route/install/install.go +++ b/pkg/route/apis/route/install/install.go @@ -6,9 +6,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" kapi "k8s.io/kubernetes/pkg/api" - routeapiv1 "github.com/openshift/api/route/v1" "github.com/openshift/origin/pkg/api/legacy" routeapi "github.com/openshift/origin/pkg/route/apis/route" + routeapiv1 "github.com/openshift/origin/pkg/route/apis/route/v1" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/route/apis/route/v1/register.go b/pkg/route/apis/route/v1/register.go index 29cba765ab52..06df15c25567 100644 --- a/pkg/route/apis/route/v1/register.go +++ b/pkg/route/apis/route/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/route/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,10 @@ var ( SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"} - LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions) + LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions) AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addFieldSelectorKeyConversions, RegisterDefaults) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addFieldSelectorKeyConversions, RegisterDefaults) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -28,22 +28,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, - &Route{}, - &RouteList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &Route{}, - &RouteList{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -} diff --git a/pkg/security/apis/security/install/install.go b/pkg/security/apis/security/install/install.go index e52851fd3187..2faf9387b71f 100644 --- a/pkg/security/apis/security/install/install.go +++ b/pkg/security/apis/security/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - securityapiv1 "github.com/openshift/api/security/v1" "github.com/openshift/origin/pkg/api/legacy" securityapi "github.com/openshift/origin/pkg/security/apis/security" + securityapiv1 "github.com/openshift/origin/pkg/security/apis/security/v1" ) func init() { diff --git a/pkg/security/apis/security/v1/register.go b/pkg/security/apis/security/v1/register.go index ea2ee4fd79af..1c60985625c4 100644 --- a/pkg/security/apis/security/v1/register.go +++ b/pkg/security/apis/security/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/security/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,10 @@ var ( SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"} - LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addDefaultingFuncs, RegisterDeepCopies, RegisterDefaults, RegisterConversions) + LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addDefaultingFuncs, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions) AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addDefaultingFuncs) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addDefaultingFuncs) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -28,28 +28,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, - &SecurityContextConstraints{}, - &SecurityContextConstraintsList{}, - &PodSecurityPolicySubjectReview{}, - &PodSecurityPolicySelfSubjectReview{}, - &PodSecurityPolicyReview{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &SecurityContextConstraints{}, - &SecurityContextConstraintsList{}, - &PodSecurityPolicySubjectReview{}, - &PodSecurityPolicySelfSubjectReview{}, - &PodSecurityPolicyReview{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -} diff --git a/pkg/template/apis/template/install/install.go b/pkg/template/apis/template/install/install.go index 82177b3fd6ac..ea287e979d05 100644 --- a/pkg/template/apis/template/install/install.go +++ b/pkg/template/apis/template/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - templateapiv1 "github.com/openshift/api/template/v1" "github.com/openshift/origin/pkg/api/legacy" templateapi "github.com/openshift/origin/pkg/template/apis/template" + templateapiv1 "github.com/openshift/origin/pkg/template/apis/template/v1" ) func init() { diff --git a/pkg/template/apis/template/v1/register.go b/pkg/template/apis/template/v1/register.go index bf2238e76c42..b5d4cf0936a4 100644 --- a/pkg/template/apis/template/v1/register.go +++ b/pkg/template/apis/template/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/template/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -17,10 +16,10 @@ var ( SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"} - LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, RegisterDeepCopies, RegisterDeepCopies, RegisterDefaults, RegisterConversions) + LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions) AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -29,29 +28,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, - &Template{}, - &TemplateList{}, - &TemplateInstance{}, - &TemplateInstanceList{}, - &BrokerTemplateInstance{}, - &BrokerTemplateInstanceList{}, - &kapiv1.List{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &Template{}, - &TemplateList{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - scheme.AddKnownTypeWithName(LegacySchemeGroupVersion.WithKind("TemplateConfig"), &Template{}) - scheme.AddKnownTypeWithName(LegacySchemeGroupVersion.WithKind("ProcessedTemplate"), &Template{}) - return nil -} diff --git a/pkg/user/apis/user/install/install.go b/pkg/user/apis/user/install/install.go index 858a494fbb03..a3121c3d6c47 100644 --- a/pkg/user/apis/user/install/install.go +++ b/pkg/user/apis/user/install/install.go @@ -7,9 +7,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" kapi "k8s.io/kubernetes/pkg/api" - userapiv1 "github.com/openshift/api/user/v1" "github.com/openshift/origin/pkg/api/legacy" userapi "github.com/openshift/origin/pkg/user/apis/user" + userapiv1 "github.com/openshift/origin/pkg/user/apis/user/v1" ) func init() { diff --git a/pkg/user/apis/user/v1/register.go b/pkg/user/apis/user/v1/register.go index ac7263a39444..c3e038d1d23e 100644 --- a/pkg/user/apis/user/v1/register.go +++ b/pkg/user/apis/user/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/openshift/api/user/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -16,10 +16,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) + SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions) AddToScheme = SchemeBuilder.AddToScheme localSchemeBuilder = &SchemeBuilder @@ -28,33 +28,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, - &User{}, - &UserList{}, - &Identity{}, - &IdentityList{}, - &UserIdentityMapping{}, - &Group{}, - &GroupList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} - -// Adds the list of known types to api.Scheme. -func addLegacyKnownTypes(scheme *runtime.Scheme) error { - types := []runtime.Object{ - &User{}, - &UserList{}, - &Identity{}, - &IdentityList{}, - &UserIdentityMapping{}, - &Group{}, - &GroupList{}, - } - scheme.AddKnownTypes(LegacySchemeGroupVersion, types...) - return nil -}