build: separate legacy and api group registration

Author: mfojtik

pkg/build/api/install/apigroup.go

@@ -12,10 +12,10 @@ const importPrefix = "github.com/openshift/origin/pkg/build/api"
 func init() {
 	if err := announced.NewGroupMetaFactory(
 		&announced.GroupMetaFactoryArgs{
-			GroupName:              api.GroupName,
-			VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version},
-			ImportPrefix:           importPrefix,
-			//AddInternalObjectsToScheme: api.AddToScheme,
+			GroupName:                  api.GroupName,
+			VersionPreferenceOrder:     []string{v1.SchemeGroupVersion.Version},
+			ImportPrefix:               importPrefix,
+			AddInternalObjectsToScheme: api.AddToScheme,
 		},
 		announced.VersionToSchemeFunc{
 			v1.SchemeGroupVersion.Version: v1.AddToScheme,

pkg/build/api/install/install.go

@@ -67,7 +67,7 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 
 func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {
 	// add the internal version to Scheme
-	api.AddToScheme(kapi.Scheme)
+	api.LegacyAddToScheme(kapi.Scheme)
 	// add the enabled external versions to Scheme
 	for _, v := range externalVersions {
 		if !registered.IsEnabledVersion(v) {
@@ -76,7 +76,7 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {
 		}
 		switch v {
 		case v1.LegacySchemeGroupVersion:
-			v1.AddToScheme(kapi.Scheme)
+			v1.LegacyAddToScheme(kapi.Scheme)
 
 		default:
 			glog.Errorf("Version %s is not known, so it will not be added to the Scheme.", v)

pkg/build/api/register.go

@@ -7,15 +7,16 @@ import (
 	"k8s.io/kubernetes/pkg/watch/versioned"
 )
 
-const (
-	LegacyGroupName = ""
-	GroupName       = "build.openshift.io"
-)
+const GroupName = "build.openshift.io"
+const LegacyGroupName = ""
 
 var (
 	SchemeGroupVersion       = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
 	LegacySchemeGroupVersion = unversioned.GroupVersion{Group: LegacyGroupName, Version: runtime.APIVersionInternal}
 
+	LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes)
+	LegacyAddToScheme   = LegacySchemeBuilder.AddToScheme
+
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
@@ -30,7 +31,7 @@ func Resource(resource string) unversioned.GroupResource {
 	return SchemeGroupVersion.WithResource(resource).GroupResource()
 }
 
-// Adds the list of known types to api.Scheme.
+// addKnownTypes adds types to API group
 func addKnownTypes(scheme *runtime.Scheme) error {
 	types := []runtime.Object{
 		&Build{},
@@ -51,9 +52,22 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		)...,
 	)
 	versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
 
-	// legacy: register in core group
+// addLegacyKnownTypes adds types to legacy API group
+// TODO: 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
 }

pkg/build/api/v1/register.go

@@ -14,11 +14,14 @@ var (
 	SchemeGroupVersion       = unversioned.GroupVersion{Group: GroupName, Version: "v1"}
 	LegacySchemeGroupVersion = unversioned.GroupVersion{Group: LegacyGroupName, Version: "v1"}
 
+	LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addDefaultingFuncs)
+	LegacyAddToScheme   = LegacySchemeBuilder.AddToScheme
+
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addDefaultingFuncs)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
-// Adds the list of known types to api.Scheme.
+// addKnownTypes adds types to API group
 func addKnownTypes(scheme *runtime.Scheme) error {
 	types := []runtime.Object{
 		&Build{},
@@ -39,9 +42,22 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		)...,
 	)
 	versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
 
-	// legacy: register in core group
+// addLegacyKnownTypes adds types to legacy API group
+// TODO: 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
 }