WIP: standalone registration

Author: mfojtik

pkg/build/api/install/apigroup.go

@@ -1,7 +1,11 @@
 package install
 
 import (
+	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apimachinery/announced"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/watch/versioned"
 
 	"github.com/openshift/origin/pkg/build/api"
 	"github.com/openshift/origin/pkg/build/api/v1"
@@ -12,15 +16,63 @@ 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: addKnownInternalTypes,
 		},
 		announced.VersionToSchemeFunc{
-			v1.SchemeGroupVersion.Version: v1.AddToScheme,
+			v1.SchemeGroupVersion.Version: addKnownExternalTypes,
 		},
 	).Announce().RegisterAndEnable(); err != nil {
 		panic(err)
 	}
 }
+
+func addKnownExternalTypes(scheme *runtime.Scheme) error {
+	types := []runtime.Object{
+		&v1.Build{},
+		&v1.BuildList{},
+		&v1.BuildConfig{},
+		&v1.BuildConfigList{},
+		&v1.BuildLog{},
+		&v1.BuildRequest{},
+		&v1.BuildLogOptions{},
+		&v1.BinaryBuildRequestOptions{},
+	}
+	scheme.AddKnownTypes(api.SchemeGroupVersion,
+		append(types,
+			&unversioned.Status{},
+			&kapi.ListOptions{},
+			&kapi.DeleteOptions{},
+			&kapi.ExportOptions{},
+		)...,
+	)
+	versioned.AddToGroupVersion(scheme, v1.SchemeGroupVersion)
+	scheme.AddKnownTypes(v1.SchemeGroupVersion, types...)
+	return nil
+}
+
+func addKnownInternalTypes(scheme *runtime.Scheme) error {
+	types := []runtime.Object{
+		&api.Build{},
+		&api.BuildList{},
+		&api.BuildConfig{},
+		&api.BuildConfigList{},
+		&api.BuildLog{},
+		&api.BuildRequest{},
+		&api.BuildLogOptions{},
+		&api.BinaryBuildRequestOptions{},
+	}
+	scheme.AddKnownTypes(api.SchemeGroupVersion,
+		append(types,
+			&unversioned.Status{},
+			&kapi.ListOptions{},
+			&kapi.DeleteOptions{},
+			&kapi.ExportOptions{},
+		)...,
+	)
+	versioned.AddToGroupVersion(scheme, api.SchemeGroupVersion)
+	scheme.AddKnownTypes(api.SchemeGroupVersion, types...)
+	return nil
+}

pkg/build/api/register.go

@@ -1,10 +1,8 @@
 package api
 
 import (
-	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/watch/versioned"
 )
 
 const (
@@ -42,15 +40,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&BuildLogOptions{},
 		&BinaryBuildRequestOptions{},
 	}
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		append(types,
-			&unversioned.Status{}, // TODO: revisit in 1.6 when Status is actually registered as unversioned
-			&kapi.ListOptions{},
-			&kapi.DeleteOptions{},
-			&kapi.ExportOptions{},
-		)...,
-	)
-	versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
 
 	// legacy: register in core group
 	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)

pkg/build/api/v1/register.go

@@ -1,10 +1,8 @@
 package v1
 
 import (
-	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/watch/versioned"
 )
 
 const GroupName = "build.openshift.io"
@@ -30,15 +28,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&BuildLogOptions{},
 		&BinaryBuildRequestOptions{},
 	}
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		append(types,
-			&unversioned.Status{}, // TODO: revisit in 1.6 when Status is actually registered as unversioned
-			&kapi.ListOptions{},
-			&kapi.DeleteOptions{},
-			&kapi.ExportOptions{},
-		)...,
-	)
-	versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
 
 	// legacy: register in core group
 	scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)