@@ -407,14 +407,12 @@ func (o CreateNodeConfigOptions) MakeNodeConfig(serverCertFile, serverKeyFile, n

 		return err

 	}

-	groupMeta := registered.GroupOrDie(configapi.GroupName)

-

 	// Roundtrip the config to v1 and back to ensure proper defaults are set.

-	ext, err := kapi.Scheme.ConvertToVersion(config, groupMeta.GroupVersions[0].String())

+	ext, err := configapi.Scheme.ConvertToVersion(config, latestconfigapi.Version.String())

 	if err != nil {

 		return err

 	}

-	internal, err := kapi.Scheme.ConvertToVersion(ext, configapi.SchemeGroupVersion.String())

+	internal, err := configapi.Scheme.ConvertToVersion(ext, configapi.SchemeGroupVersion.String())

 	if err != nil {

 		return err

 	}

@@ -434,7 +432,7 @@ func (o CreateNodeConfigOptions) MakeNodeJSON(nodeJSONFile string) error {

 	node := &kapi.Node{}

 	node.Name = o.NodeName

-	groupMeta := registered.GroupOrDie(configapi.GroupName)

+	groupMeta := registered.GroupOrDie(kapi.GroupName)

 	json, err := runtime.Encode(kapi.Codecs.LegacyCodec(groupMeta.GroupVersions[0]), node)

 	if err != nil {

@@ -1,17 +1,10 @@

 package install

 import (

-	"fmt"

-

 	"github.com/golang/glog"

-	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/meta"

 	"k8s.io/kubernetes/pkg/api/unversioned"

-	"k8s.io/kubernetes/pkg/apimachinery"

-	"k8s.io/kubernetes/pkg/apimachinery/registered"

-	"k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util/sets"

 	"github.com/openshift/origin/pkg/cmd/server/api"

 	"github.com/openshift/origin/pkg/cmd/server/api/v1"

@@ -25,22 +18,7 @@ var accessor = meta.NewAccessor()

 var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion}

 func init() {

-	registered.RegisterVersions(availableVersions)

-	externalVersions := []unversioned.GroupVersion{}

-	for _, v := range availableVersions {

-		if registered.IsAllowedVersion(v) {

-			externalVersions = append(externalVersions, v)

-		}

-	}

-	if len(externalVersions) == 0 {

-		glog.Infof("No version is registered for group %v", api.GroupName)

-		return

-	}

-

-	if err := registered.EnableVersions(externalVersions...); err != nil {

-		panic(err)

-	}

-	if err := enableVersions(externalVersions); err != nil {

+	if err := enableVersions(availableVersions); err != nil {

 		panic(err)

 	}

 }

@@ -51,35 +29,17 @@ func init() {

 // registered.RegisterGroup once we have moved enableVersions there.

 func enableVersions(externalVersions []unversioned.GroupVersion) error {

 	addVersionsToScheme(externalVersions...)

-	preferredExternalVersion := externalVersions[0]

-

-	groupMeta := apimachinery.GroupMeta{

-		GroupVersion:  preferredExternalVersion,

-		GroupVersions: externalVersions,

-		RESTMapper:    newRESTMapper(externalVersions),

-		SelfLinker:    runtime.SelfLinker(accessor),

-		InterfacesFor: interfacesFor,

-	}

-

-	if err := registered.RegisterGroup(groupMeta); err != nil {

-		return err

-	}

-	kapi.RegisterRESTMapper(groupMeta.RESTMapper)

 	return nil

 }

 func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {

 	// add the internal version to Scheme

-	api.AddToScheme(kapi.Scheme)

+	api.AddToScheme(api.Scheme)

 	// add the enabled external versions to Scheme

 	for _, v := range externalVersions {

-		if !registered.IsEnabledVersion(v) {

-			glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v)

-			continue

-		}

 		switch v {

 		case v1.SchemeGroupVersion:

-			v1.AddToScheme(kapi.Scheme)

+			v1.AddToScheme(api.Scheme)

 		default:

 			glog.Errorf("Version %s is not known, so it will not be added to the Scheme.", v)

@@ -87,23 +47,3 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {

 		}

 	}

 }

-

-func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper {

-	rootScoped := sets.NewString()

-	ignoredKinds := sets.NewString()

-	return kapi.NewDefaultRESTMapper(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped)

-}

-

-func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) {

-	switch version {

-	case v1.SchemeGroupVersion:

-		return &meta.VersionInterfaces{

-			ObjectConvertor:  kapi.Scheme,

-			MetadataAccessor: accessor,

-		}, nil

-

-	default:

-		g, _ := registered.Group(api.GroupName)

-		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)

-	}

-}

@@ -8,12 +8,10 @@ import (

 	"github.com/ghodss/yaml"

-	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/runtime"

 	kyaml "k8s.io/kubernetes/pkg/util/yaml"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

-	"github.com/openshift/origin/pkg/cmd/server/api/v1"

 )

 func ReadSessionSecrets(filename string) (*configapi.SessionSecrets, error) {

@@ -68,7 +66,7 @@ func ReadAndResolveNodeConfig(filename string) (*configapi.NodeConfig, error) {

 // TODO: Remove this when a YAML serializer is available from upstream

 func WriteYAML(obj runtime.Object) ([]byte, error) {

-	json, err := runtime.Encode(kapi.Codecs.LegacyCodec(v1.SchemeGroupVersion), obj)

+	json, err := runtime.Encode(Codec, obj)

 	if err != nil {

 		return nil, err

 	}

@@ -86,7 +84,7 @@ func ReadYAML(data []byte, obj runtime.Object) error {

 	if err != nil {

 		return err

 	}

-	err = runtime.DecodeInto(kapi.Codecs.UniversalDecoder(), data, obj)

+	err = runtime.DecodeInto(Codec, data, obj)

 	return captureSurroundingJSONForError("error reading config: ", data, err)

 }

@@ -1,7 +1,12 @@

 package latest

 import (

+	// kapi "k8s.io/kubernetes/pkg/api"

+	// "k8s.io/kubernetes/pkg/api/meta"

 	"k8s.io/kubernetes/pkg/api/unversioned"

+	"k8s.io/kubernetes/pkg/runtime/serializer"

+

+	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 )

 // HACK TO ELIMINATE CYCLE UNTIL WE KILL THIS PACKAGE

@@ -18,3 +23,45 @@ var OldestVersion = unversioned.GroupVersion{Group: "", Version: "v1"}

 // choose to prefer the latter items in the list over the former items when presented

 // with a set of versions to choose.

 var Versions = []unversioned.GroupVersion{unversioned.GroupVersion{Group: "", Version: "v1"}}

+

+var Codec = serializer.NewCodecFactory(configapi.Scheme).LegacyCodec(unversioned.GroupVersion{Group: "", Version: "v1"})

+

+// func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) {

+// 	switch version {

+// 	case unversioned.GroupVersion{Group: "", Version: "v1"}:

+// 		return &meta.VersionInterfaces{

+// 			ObjectConvertor:  kapi.Scheme,

+// 			MetadataAccessor: accessor,

+// 		}, nil

+

+// 	default:

+// 		return nil, fmt.Errorf("unsupported storage version: %s", version)

+// 	}

+// }

+

+// func NewRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper {

+// 	rootScoped := sets.NewString()

+// 	ignoredKinds := sets.NewString()

+

+// 	mapper := meta.NewDefaultRESTMapper(defaultGroupVersions, interfacesFunc)

+// 	// enumerate all supported versions, get the kinds, and register with the mapper how to address

+// 	// our resources.

+// 	for _, gv := range defaultGroupVersions {

+// 		for kind, oType := range Scheme.KnownTypes(gv) {

+// 			gvk := gv.WithKind(kind)

+// 			// TODO: Remove import path prefix check.

+// 			// We check the import path prefix because we currently stuff both "api" and "extensions" objects

+// 			// into the same group within Scheme since Scheme has no notion of groups yet.

+// 			if !strings.HasPrefix(oType.PkgPath(), importPathPrefix) || ignoredKinds.Has(kind) {

+// 				continue

+// 			}

+// 			scope := meta.RESTScopeNamespace

+// 			if rootScoped.Has(kind) {

+// 				scope = meta.RESTScopeRoot

+// 			}

+// 			mapper.Add(gvk, scope, false)

+// 		}

+// 	}

+

+// 	return kapi.NewDefaultRESTMapper(Versions, interfacesFor, importPrefix, ignoredKinds, rootScoped)

+// }

@@ -5,6 +5,8 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 )

+var Scheme = runtime.NewScheme()

+

 const GroupName = ""

 // SchemeGroupVersion is group version used to register these objects

@@ -1,12 +1,11 @@

 package v1

 import (

-	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/conversion"

 	"k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/runtime/serializer"

 	"k8s.io/kubernetes/pkg/util/sets"

-	"github.com/openshift/origin/pkg/api"

 	internal "github.com/openshift/origin/pkg/cmd/server/api"

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

 )

@@ -260,7 +259,7 @@ func addConversionFuncs(scheme *runtime.Scheme) {

 			return nil

 		},

 		func(in *internal.IdentityProvider, out *IdentityProvider, s conversion.Scope) error {

-			if err := api.Convert_runtime_Object_To_runtime_RawExtension(in.Provider, &out.Provider, s); err != nil {

+			if err := convert_runtime_Object_To_runtime_RawExtension(in.Provider, &out.Provider, s); err != nil {

 				return err

 			}

 			out.Name = in.Name

@@ -270,12 +269,12 @@ func addConversionFuncs(scheme *runtime.Scheme) {

 			return nil

 		},

 		func(in *IdentityProvider, out *internal.IdentityProvider, s conversion.Scope) error {

-			if err := api.Convert_runtime_RawExtension_To_runtime_Object(&in.Provider, out.Provider, s); err != nil {

+			if err := convert_runtime_RawExtension_To_runtime_Object(&in.Provider, out.Provider, s); err != nil {

 				return err

 			}

 			if in.Provider.Object != nil {

 				var err error

-				out.Provider, err = kapi.Scheme.ConvertToVersion(in.Provider.Object, internal.SchemeGroupVersion.String())

+				out.Provider, err = internal.Scheme.ConvertToVersion(in.Provider.Object, internal.SchemeGroupVersion.String())

 				if err != nil {

 					return err

 				}

@@ -287,19 +286,19 @@ func addConversionFuncs(scheme *runtime.Scheme) {

 			return nil

 		},

 		func(in *internal.AdmissionPluginConfig, out *AdmissionPluginConfig, s conversion.Scope) error {

-			if err := api.Convert_runtime_Object_To_runtime_RawExtension(in.Configuration, &out.Configuration, s); err != nil {

+			if err := convert_runtime_Object_To_runtime_RawExtension(in.Configuration, &out.Configuration, s); err != nil {

 				return err

 			}

 			out.Location = in.Location

 			return nil

 		},

 		func(in *AdmissionPluginConfig, out *internal.AdmissionPluginConfig, s conversion.Scope) error {

-			if err := api.Convert_runtime_RawExtension_To_runtime_Object(&in.Configuration, out.Configuration, s); err != nil {

+			if err := convert_runtime_RawExtension_To_runtime_Object(&in.Configuration, out.Configuration, s); err != nil {

 				return err

 			}

 			if in.Configuration.Object != nil {

 				var err error

-				out.Configuration, err = kapi.Scheme.ConvertToVersion(in.Configuration.Object, internal.SchemeGroupVersion.String())

+				out.Configuration, err = internal.Scheme.ConvertToVersion(in.Configuration.Object, internal.SchemeGroupVersion.String())

 				if err != nil {

 					return err

 				}

@@ -313,3 +312,53 @@ func addConversionFuncs(scheme *runtime.Scheme) {

 		panic(err)

 	}

 }

+

+var codec = serializer.NewCodecFactory(internal.Scheme).LegacyCodec(SchemeGroupVersion)

+

+// Convert_runtime_Object_To_runtime_RawExtension is conversion function that assumes that the runtime.Object you've embedded is in

+// the same GroupVersion that your containing type is in.  This is signficantly better than simply breaking.

+// Given an ordered list of preferred external versions for a given encode or conversion call, the behavior of this function could be

+// made generic, predictable, and controllable.

+func convert_runtime_Object_To_runtime_RawExtension(in runtime.Object, out *runtime.RawExtension, s conversion.Scope) error {

+	if in == nil {

+		return nil

+	}

+

+	externalObject, err := internal.Scheme.ConvertToVersion(in, s.Meta().DestVersion)

+	if err != nil {

+		return err

+	}

+

+	bytes, err := runtime.Encode(codec, externalObject)

+	if err != nil {

+		return err

+	}

+

+	out.RawJSON = bytes

+	out.Object = externalObject

+

+	return nil

+}

+

+// Convert_runtime_RawExtension_To_runtime_Object well, this is the reason why there was runtime.Embedded.  The `out` here is hopeless.

+// The caller doesn't know the type ahead of time and that means this method can't communicate the return value.  This sucks really badly.

+// I'm going to set the `in.Object` field can have callers to this function do magic to pull it back out.  I'm also going to bitch about it.

+func convert_runtime_RawExtension_To_runtime_Object(in *runtime.RawExtension, out runtime.Object, s conversion.Scope) error {

+	if in == nil || len(in.RawJSON) == 0 || in.Object != nil {

+		return nil

+	}

+

+	decodedObject, err := runtime.Decode(codec, in.RawJSON)

+	if err != nil {

+		return err

+	}

+

+	internalObject, err := internal.Scheme.ConvertToVersion(decodedObject, s.Meta().DestVersion)

+	if err != nil {

+		return err

+	}

+

+	in.Object = internalObject

+

+	return nil

+}

@@ -9,7 +9,6 @@ import (

 	"github.com/spf13/pflag"

-	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/unversioned"

 	"k8s.io/kubernetes/pkg/master/ports"

 	"k8s.io/kubernetes/pkg/registry/service/ipallocator"

@@ -628,11 +627,11 @@ func getPort(theURL url.URL) int {

 // applyDefaults roundtrips the config to v1 and back to ensure proper defaults are set.

 func applyDefaults(config runtime.Object, version unversioned.GroupVersion) (runtime.Object, error) {

-	ext, err := kapi.Scheme.ConvertToVersion(config, version.String())

+	ext, err := configapi.Scheme.ConvertToVersion(config, version.String())

 	if err != nil {

 		return nil, err

 	}

-	return kapi.Scheme.ConvertToVersion(ext, configapi.SchemeGroupVersion.String())

+	return configapi.Scheme.ConvertToVersion(ext, configapi.SchemeGroupVersion.String())

 }

 func servingInfoForAddr(addr *flagtypes.Addr) configapi.ServingInfo {

@@ -239,6 +239,7 @@ func (o MasterOptions) RunMaster() error {

 		content, err := configapilatest.WriteYAML(masterConfig)

 		if err != nil {

+

 			return err

 		}

@@ -1,23 +1,17 @@

 package install

 import (

-	"fmt"

-

 	"github.com/golang/glog"

-	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/meta"

 	"k8s.io/kubernetes/pkg/api/unversioned"

-	"k8s.io/kubernetes/pkg/apimachinery"

-	"k8s.io/kubernetes/pkg/apimachinery/registered"

-	"k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util/sets"

+	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 	"github.com/openshift/origin/pkg/project/admission/requestlimit/api"

 	"github.com/openshift/origin/pkg/project/admission/requestlimit/api/v1"

 )

-const importPrefix = "github.com/openshift/origin/pkg/project/admission/requestlimit"

+const importPrefix = "github.com/openshift/origin/pkg/project/admission/requestlimit/api"

 var accessor = meta.NewAccessor()

@@ -25,22 +19,7 @@ var accessor = meta.NewAccessor()

 var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion}

 func init() {

-	registered.RegisterVersions(availableVersions)

-	externalVersions := []unversioned.GroupVersion{}

-	for _, v := range availableVersions {

-		if registered.IsAllowedVersion(v) {

-			externalVersions = append(externalVersions, v)

-		}

-	}

-	if len(externalVersions) == 0 {

-		glog.Infof("No version is registered for group %v", api.GroupName)

-		return

-	}

-

-	if err := registered.EnableVersions(externalVersions...); err != nil {

-		panic(err)

-	}

-	if err := enableVersions(externalVersions); err != nil {

+	if err := enableVersions(availableVersions); err != nil {

 		panic(err)

 	}

 }

@@ -51,35 +30,17 @@ func init() {

 // registered.RegisterGroup once we have moved enableVersions there.

 func enableVersions(externalVersions []unversioned.GroupVersion) error {

 	addVersionsToScheme(externalVersions...)

-	preferredExternalVersion := externalVersions[0]

-

-	groupMeta := apimachinery.GroupMeta{

-		GroupVersion:  preferredExternalVersion,

-		GroupVersions: externalVersions,

-		RESTMapper:    newRESTMapper(externalVersions),

-		SelfLinker:    runtime.SelfLinker(accessor),

-		InterfacesFor: interfacesFor,

-	}

-

-	if err := registered.RegisterGroup(groupMeta); err != nil {

-		return err

-	}

-	kapi.RegisterRESTMapper(groupMeta.RESTMapper)

 	return nil

 }

 func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {

 	// add the internal version to Scheme

-	api.AddToScheme(kapi.Scheme)

+	api.AddToScheme(configapi.Scheme)

 	// add the enabled external versions to Scheme

 	for _, v := range externalVersions {

-		if !registered.IsEnabledVersion(v) {

-			glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v)

-			continue

-		}

 		switch v {

 		case v1.SchemeGroupVersion:

-			v1.AddToScheme(kapi.Scheme)

+			v1.AddToScheme(configapi.Scheme)

 		default:

 			glog.Errorf("Version %s is not known, so it will not be added to the Scheme.", v)

@@ -87,23 +48,3 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {

 		}

 	}

 }

-

-func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper {

-	rootScoped := sets.NewString()

-	ignoredKinds := sets.NewString()

-	return kapi.NewDefaultRESTMapper(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped)

-}

-

-func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) {

-	switch version {

-	case v1.SchemeGroupVersion:

-		return &meta.VersionInterfaces{

-			ObjectConvertor:  kapi.Scheme,

-			MetadataAccessor: accessor,

-		}, nil

-

-	default:

-		g, _ := registered.Group(api.GroupName)

-		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)

-	}

-}