Merge pull request #39814 from deads2k/api-58-multi-register

cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD

@@ -22,7 +22,6 @@ go_library(
         "//pkg/client/testing/core:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
         "//pkg/client/typed/discovery/fake:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go

@@ -17,7 +17,6 @@ limitations under the License.
 package fake
 
 import (
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
@@ -42,7 +41,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go

@@ -18,7 +18,6 @@ package v1alpha1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type ApiregistrationV1alpha1Interface interface {
 	APIServicesGetter
 }
 
-// ApiregistrationV1alpha1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// ApiregistrationV1alpha1Client is used to interact with features provided by the apiregistration.k8s.io group.
 type ApiregistrationV1alpha1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if apiregistration.k8s.io/v1alpha1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("apiregistration.k8s.io/v1alpha1 is not enabled")
 	}
 	config.APIPath = "/apis"

cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD

@@ -22,7 +22,6 @@ go_library(
         "//pkg/client/testing/core:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
         "//pkg/client/typed/discovery/fake:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go

@@ -17,7 +17,6 @@ limitations under the License.
 package fake
 
 import (
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
@@ -42,7 +41,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go

@@ -17,7 +17,6 @@ limitations under the License.
 package internalversion
 
 import (
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	api "k8s.io/kubernetes/pkg/api"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 )
@@ -27,7 +26,7 @@ type ApiregistrationInterface interface {
 	APIServicesGetter
 }
 
-// ApiregistrationClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// ApiregistrationClient is used to interact with features provided by the apiregistration.k8s.io group.
 type ApiregistrationClient struct {
 	restClient restclient.Interface
 }
@@ -66,7 +65,7 @@ func New(c restclient.Interface) *ApiregistrationClient {
 
 func setConfigDefaults(config *restclient.Config) error {
 	// if apiregistration group is not registered, return an error
-	g, err := registered.Group("apiregistration.k8s.io")
+	g, err := api.Registry.Group("apiregistration.k8s.io")
 	if err != nil {
 		return err
 	}

cmd/kube-controller-manager/app/BUILD

@@ -95,7 +95,6 @@ go_library(
         "//vendor:github.com/prometheus/client_golang/prometheus",
         "//vendor:github.com/spf13/cobra",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

cmd/kube-controller-manager/app/core.go

@@ -23,7 +23,6 @@ package app
 import (
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -100,7 +99,7 @@ func startResourceQuotaController(ctx ControllerContext) (bool, error) {
 
 func startNamespaceController(ctx ControllerContext) (bool, error) {
 	// TODO: should use a dynamic RESTMapper built from the discovery results.
-	restMapper := registered.RESTMapper()
+	restMapper := api.Registry.RESTMapper()
 
 	// Find the list of namespaced resources via discovery that the namespace controller must manage
 	namespaceKubeClient := ctx.ClientBuilder.ClientOrDie("namespace-controller")
@@ -148,7 +147,7 @@ func startGarbageCollectorController(ctx ControllerContext) (bool, error) {
 	}
 
 	// TODO: should use a dynamic RESTMapper built from the discovery results.
-	restMapper := registered.RESTMapper()
+	restMapper := api.Registry.RESTMapper()
 
 	gcClientset := ctx.ClientBuilder.ClientOrDie("generic-garbage-collector")
 	preferredResources, err := gcClientset.Discovery().ServerPreferredResources()

cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go

@@ -70,7 +70,6 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
 	// imports for the code in commonTemplate
 	imports = append(imports,
 		"k8s.io/kubernetes/pkg/api",
-		"k8s.io/apimachinery/pkg/apimachinery/registered",
 		"k8s.io/kubernetes/pkg/client/testing/core",
 		"k8s.io/kubernetes/pkg/client/typed/discovery",
 		"fakediscovery \"k8s.io/kubernetes/pkg/client/typed/discovery/fake\"",
@@ -118,7 +117,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

cmd/libs/go2idl/client-gen/generators/generator_for_group.go

@@ -58,7 +58,6 @@ func (g *genGroup) Imports(c *generator.Context) (imports []string) {
 func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error {
 	sw := generator.NewSnippetWriter(w, c, "$", "$")
 	const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient"
-	const pkgRegistered = "k8s.io/apimachinery/pkg/apimachinery/registered"
 	const pkgAPI = "k8s.io/kubernetes/pkg/api"
 	const pkgSerializer = "k8s.io/apimachinery/pkg/runtime/serializer"
 	const pkgUnversioned = "k8s.io/kubernetes/pkg/api/unversioned"
@@ -94,11 +93,9 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer
 		"DefaultKubernetesUserAgent": c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "DefaultKubernetesUserAgent"}),
 		"RESTClientInterface":        c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Interface"}),
 		"RESTClientFor":              c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "RESTClientFor"}),
-		"Group":                      c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "Group"}),
-		"GroupOrDie":                 c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "GroupOrDie"}),
-		"IsEnabledVersion":           c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "IsEnabledVersion"}),
 		"ParseGroupVersion":          c.Universe.Function(types.Name{Package: pkgSchema, Name: "ParseGroupVersion"}),
 		"apiPath":                    apiPath(g.group),
+		"apiRegistry":                c.Universe.Variable(types.Name{Package: pkgAPI, Name: "Registry"}),
 		"codecs":                     c.Universe.Variable(types.Name{Package: pkgAPI, Name: "Codecs"}),
 		"directCodecFactory":         c.Universe.Variable(types.Name{Package: pkgSerializer, Name: "DirectCodecFactory"}),
 		"Errorf":                     c.Universe.Variable(types.Name{Package: "fmt", Name: "Errorf"}),
@@ -140,7 +137,7 @@ type $.GroupVersion$Interface interface {
 `
 
 var groupClientTemplate = `
-// $.GroupVersion$Client is used to interact with features provided by the $.Group$ group.
+// $.GroupVersion$Client is used to interact with features provided by the $.groupName$ group.
 type $.GroupVersion$Client struct {
 	restClient $.RESTClientInterface|raw$
 }
@@ -205,7 +202,7 @@ func New(c $.RESTClientInterface|raw$) *$.GroupVersion$Client {
 var setInternalVersionClientDefaultsTemplate = `
 func setConfigDefaults(config *$.Config|raw$) error {
 	// if $.group$ group is not registered, return an error
-	g, err := $.Group|raw$("$.groupName$")
+	g, err := $.apiRegistry|raw$.Group("$.groupName$")
 	if err != nil {
 		return err
 	}
@@ -236,7 +233,7 @@ func setConfigDefaults(config *$.Config|raw$) error {
 		return err
 	}
 	// if $.groupName$/$.version$ is not enabled, return an error
-	if ! $.IsEnabledVersion|raw$(gv) {
+	if ! $.apiRegistry|raw$.IsEnabledVersion(gv) {
 		return $.Errorf|raw$("$.groupName$/$.version$ is not enabled")
 	}
 	config.APIPath = $.apiPath$

cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apimachinery",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go

@@ -25,7 +25,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apimachinery"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -45,9 +44,9 @@ var availableVersions = []schema.GroupVersion{{Group: groupName, Version: "v1"}}
 
 func init() {
 	externalVersions := availableVersions
-	registered.RegisterVersions(availableVersions)
+	api.Registry.RegisterVersions(availableVersions)
 
-	if err := registered.EnableVersions(externalVersions...); err != nil {
+	if err := api.Registry.EnableVersions(externalVersions...); err != nil {
 		glog.V(4).Infof("%v", err)
 		return
 	}
@@ -59,8 +58,8 @@ func init() {
 
 // TODO: enableVersions should be centralized rather than spread in each API
 // group.
-// We can combine registered.RegisterVersions, registered.EnableVersions and
-// registered.RegisterGroup once we have moved enableVersions there.
+// We can combine api.Registry.RegisterVersions, api.Registry.EnableVersions and
+// api.Registry.RegisterGroup once we have moved enableVersions there.
 func enableVersions(externalVersions []schema.GroupVersion) error {
 	addVersionsToScheme(externalVersions...)
 	preferredExternalVersion := externalVersions[0]
@@ -73,7 +72,7 @@ func enableVersions(externalVersions []schema.GroupVersion) error {
 		InterfacesFor: interfacesFor,
 	}
 
-	if err := registered.RegisterGroup(groupMeta); err != nil {
+	if err := api.Registry.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
 	return nil
@@ -99,7 +98,7 @@ func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error)
 			MetadataAccessor: accessor,
 		}, nil
 	default:
-		g, _ := registered.Group(groupName)
+		g, _ := api.Registry.Group(groupName)
 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
 	}
 }

cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD

@@ -22,7 +22,6 @@ go_library(
         "//pkg/client/testing/core:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
         "//pkg/client/typed/discovery/fake:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go

@@ -17,7 +17,6 @@ limitations under the License.
 package fake
 
 import (
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset"
@@ -42,7 +41,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go

@@ -17,7 +17,6 @@ limitations under the License.
 package internalversion
 
 import (
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	api "k8s.io/kubernetes/pkg/api"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 )
@@ -27,7 +26,7 @@ type TestgroupInterface interface {
 	TestTypesGetter
 }
 
-// TestgroupClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// TestgroupClient is used to interact with features provided by the testgroup.k8s.io group.
 type TestgroupClient struct {
 	restClient restclient.Interface
 }
@@ -66,7 +65,7 @@ func New(c restclient.Interface) *TestgroupClient {
 
 func setConfigDefaults(config *restclient.Config) error {
 	// if testgroup group is not registered, return an error
-	g, err := registered.Group("testgroup.k8s.io")
+	g, err := api.Registry.Group("testgroup.k8s.io")
 	if err != nil {
 		return err
 	}

examples/apiserver/BUILD

@@ -24,7 +24,6 @@ go_library(
         "//pkg/registry/generic:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
         "//vendor:github.com/golang/glog",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/errors",
     ],

examples/apiserver/apiserver.go

@@ -19,7 +19,6 @@ package apiserver
 import (
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1"
@@ -124,7 +123,7 @@ func (serverOptions *ServerRunOptions) Run(stopCh <-chan struct{}) error {
 
 	groupVersion := v1.SchemeGroupVersion
 	groupName := groupVersion.Group
-	groupMeta, err := registered.Group(groupName)
+	groupMeta, err := api.Registry.Group(groupName)
 	if err != nil {
 		return fmt.Errorf("%v", err)
 	}

examples/https-nginx/BUILD

@@ -21,7 +21,6 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/install:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
     ],
 )

examples/https-nginx/make_secret.go

@@ -26,7 +26,6 @@ import (
 	"io/ioutil"
 	"log"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api"
 
@@ -66,5 +65,5 @@ func main() {
 			"nginx.key": nginxKey,
 		},
 	}
-	fmt.Printf(runtime.EncodeOrDie(api.Codecs.LegacyCodec(registered.EnabledVersions()...), secret))
+	fmt.Printf(runtime.EncodeOrDie(api.Codecs.LegacyCodec(api.Registry.EnabledVersions()...), secret))
 }

examples/sharing-clusters/BUILD

@@ -20,7 +20,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
     ],
 )

examples/sharing-clusters/make_secret.go

@@ -23,7 +23,6 @@ import (
 	"io/ioutil"
 	"log"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api"
 )
@@ -59,5 +58,5 @@ func main() {
 			"config": cfg,
 		},
 	}
-	fmt.Printf(runtime.EncodeOrDie(api.Codecs.LegacyCodec(registered.EnabledVersions()...), secret))
+	fmt.Printf(runtime.EncodeOrDie(api.Codecs.LegacyCodec(api.Registry.EnabledVersions()...), secret))
 }

federation/apis/core/install/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apimachinery",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

federation/apis/core/install/install.go

@@ -23,7 +23,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apimachinery"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -40,10 +39,10 @@ var accessor = meta.NewAccessor()
 var availableVersions = []schema.GroupVersion{core_v1.SchemeGroupVersion}
 
 func init() {
-	registered.RegisterVersions(availableVersions)
+	api.Registry.RegisterVersions(availableVersions)
 	externalVersions := []schema.GroupVersion{}
 	for _, v := range availableVersions {
-		if registered.IsAllowedVersion(v) {
+		if api.Registry.IsAllowedVersion(v) {
 			externalVersions = append(externalVersions, v)
 		}
 	}
@@ -52,7 +51,7 @@ func init() {
 		return
 	}
 
-	if err := registered.EnableVersions(externalVersions...); err != nil {
+	if err := api.Registry.EnableVersions(externalVersions...); err != nil {
 		glog.V(4).Infof("%v", err)
 		return
 	}
@@ -64,8 +63,8 @@ func init() {
 
 // TODO: enableVersions should be centralized rather than spread in each API
 // group.
-// We can combine registered.RegisterVersions, registered.EnableVersions and
-// registered.RegisterGroup once we have moved enableVersions there.
+// We can combine api.Registry.RegisterVersions, api.Registry.EnableVersions and
+// api.Registry.RegisterGroup once we have moved enableVersions there.
 func enableVersions(externalVersions []schema.GroupVersion) error {
 	addVersionsToScheme(externalVersions...)
 	preferredExternalVersion := externalVersions[0]
@@ -78,7 +77,7 @@ func enableVersions(externalVersions []schema.GroupVersion) error {
 		InterfacesFor: interfacesFor,
 	}
 
-	if err := registered.RegisterGroup(groupMeta); err != nil {
+	if err := api.Registry.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
 	return nil
@@ -117,7 +116,7 @@ func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error)
 			MetadataAccessor: accessor,
 		}, nil
 	default:
-		g, _ := registered.Group(core.GroupName)
+		g, _ := api.Registry.Group(core.GroupName)
 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
 	}
 }
@@ -130,7 +129,7 @@ func addVersionsToScheme(externalVersions ...schema.GroupVersion) {
 	}
 	// add the enabled external versions to Scheme
 	for _, v := range externalVersions {
-		if !registered.IsEnabledVersion(v) {
+		if !api.Registry.IsEnabledVersion(v) {
 			glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v)
 			continue
 		}

federation/apis/federation/install/BUILD

@@ -19,7 +19,6 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apimachinery",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
@@ -35,7 +34,6 @@ go_test(
         "//federation/apis/federation:go_default_library",
         "//federation/apis/federation/v1beta1:go_default_library",
         "//pkg/api:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
     ],

federation/apis/federation/install/install.go

@@ -23,7 +23,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apimachinery"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -40,10 +39,10 @@ var accessor = meta.NewAccessor()
 var availableVersions = []schema.GroupVersion{v1beta1.SchemeGroupVersion}
 
 func init() {
-	registered.RegisterVersions(availableVersions)
+	api.Registry.RegisterVersions(availableVersions)
 	externalVersions := []schema.GroupVersion{}
 	for _, v := range availableVersions {
-		if registered.IsAllowedVersion(v) {
+		if api.Registry.IsAllowedVersion(v) {
 			externalVersions = append(externalVersions, v)
 		}
 	}
@@ -52,7 +51,7 @@ func init() {
 		return
 	}
 
-	if err := registered.EnableVersions(externalVersions...); err != nil {
+	if err := api.Registry.EnableVersions(externalVersions...); err != nil {
 		glog.V(4).Infof("%v", err)
 		return
 	}
@@ -64,8 +63,8 @@ func init() {
 
 // TODO: enableVersions should be centralized rather than spread in each API
 // group.
-// We can combine registered.RegisterVersions, registered.EnableVersions and
-// registered.RegisterGroup once we have moved enableVersions there.
+// We can combine api.Registry.RegisterVersions, api.Registry.EnableVersions and
+// api.Registry.RegisterGroup once we have moved enableVersions there.
 func enableVersions(externalVersions []schema.GroupVersion) error {
 	addVersionsToScheme(externalVersions...)
 	preferredExternalVersion := externalVersions[0]
@@ -78,7 +77,7 @@ func enableVersions(externalVersions []schema.GroupVersion) error {
 		InterfacesFor: interfacesFor,
 	}
 
-	if err := registered.RegisterGroup(groupMeta); err != nil {
+	if err := api.Registry.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
 	return nil
@@ -106,7 +105,7 @@ func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error)
 			MetadataAccessor: accessor,
 		}, nil
 	default:
-		g, _ := registered.Group(federation.GroupName)
+		g, _ := api.Registry.Group(federation.GroupName)
 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
 	}
 }
@@ -119,7 +118,7 @@ func addVersionsToScheme(externalVersions ...schema.GroupVersion) {
 	}
 	// add the enabled external versions to Scheme
 	for _, v := range externalVersions {
-		if !registered.IsEnabledVersion(v) {
+		if !api.Registry.IsEnabledVersion(v) {
 			glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v)
 			continue
 		}

federation/apis/federation/install/install_test.go

@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/federation/apis/federation"
@@ -52,7 +51,7 @@ func TestCodec(t *testing.T) {
 	cluster := federation.Cluster{}
 	// We do want to use package registered rather than testapi here, because we
 	// want to test if the package install and package registered work as expected.
-	data, err := runtime.Encode(api.Codecs.LegacyCodec(registered.GroupOrDie(federation.GroupName).GroupVersion), &cluster)
+	data, err := runtime.Encode(api.Codecs.LegacyCodec(api.Registry.GroupOrDie(federation.GroupName).GroupVersion), &cluster)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -60,17 +59,17 @@ func TestCodec(t *testing.T) {
 	if err := json.Unmarshal(data, &other); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if other.APIVersion != registered.GroupOrDie(federation.GroupName).GroupVersion.String() || other.Kind != "Cluster" {
+	if other.APIVersion != api.Registry.GroupOrDie(federation.GroupName).GroupVersion.String() || other.Kind != "Cluster" {
 		t.Errorf("unexpected unmarshalled object %#v", other)
 	}
 }
 
 func TestInterfacesFor(t *testing.T) {
-	if _, err := registered.GroupOrDie(federation.GroupName).InterfacesFor(federation.SchemeGroupVersion); err == nil {
+	if _, err := api.Registry.GroupOrDie(federation.GroupName).InterfacesFor(federation.SchemeGroupVersion); err == nil {
 		t.Fatalf("unexpected non-error: %v", err)
 	}
-	for i, version := range registered.GroupOrDie(federation.GroupName).GroupVersions {
-		if vi, err := registered.GroupOrDie(federation.GroupName).InterfacesFor(version); err != nil || vi == nil {
+	for i, version := range api.Registry.GroupOrDie(federation.GroupName).GroupVersions {
+		if vi, err := api.Registry.GroupOrDie(federation.GroupName).InterfacesFor(version); err != nil || vi == nil {
 			t.Fatalf("%d: unexpected result: %v", i, err)
 		}
 	}
@@ -80,16 +79,16 @@ func TestRESTMapper(t *testing.T) {
 	gv := v1beta1.SchemeGroupVersion
 	clusterGVK := gv.WithKind("Cluster")
 
-	if gvk, err := registered.GroupOrDie(federation.GroupName).RESTMapper.KindFor(gv.WithResource("clusters")); err != nil || gvk != clusterGVK {
+	if gvk, err := api.Registry.GroupOrDie(federation.GroupName).RESTMapper.KindFor(gv.WithResource("clusters")); err != nil || gvk != clusterGVK {
 		t.Errorf("unexpected version mapping: %v %v", gvk, err)
 	}
 
-	if m, err := registered.GroupOrDie(federation.GroupName).RESTMapper.RESTMapping(clusterGVK.GroupKind(), ""); err != nil || m.GroupVersionKind != clusterGVK || m.Resource != "clusters" {
+	if m, err := api.Registry.GroupOrDie(federation.GroupName).RESTMapper.RESTMapping(clusterGVK.GroupKind(), ""); err != nil || m.GroupVersionKind != clusterGVK || m.Resource != "clusters" {
 		t.Errorf("unexpected version mapping: %#v %v", m, err)
 	}
 
-	for _, version := range registered.GroupOrDie(federation.GroupName).GroupVersions {
-		mapping, err := registered.GroupOrDie(federation.GroupName).RESTMapper.RESTMapping(clusterGVK.GroupKind(), version.Version)
+	for _, version := range api.Registry.GroupOrDie(federation.GroupName).GroupVersions {
+		mapping, err := api.Registry.GroupOrDie(federation.GroupName).RESTMapper.RESTMapping(clusterGVK.GroupKind(), version.Version)
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)
 		}
@@ -101,7 +100,7 @@ func TestRESTMapper(t *testing.T) {
 			t.Errorf("incorrect groupVersion: %v", mapping)
 		}
 
-		interfaces, _ := registered.GroupOrDie(federation.GroupName).InterfacesFor(version)
+		interfaces, _ := api.Registry.GroupOrDie(federation.GroupName).InterfacesFor(version)
 		if mapping.ObjectConvertor != interfaces.ObjectConvertor {
 			t.Errorf("unexpected: %#v, expected: %#v", mapping, interfaces)
 		}

federation/client/clientset_generated/federation_clientset/fake/BUILD

@@ -28,7 +28,6 @@ go_library(
         "//pkg/client/testing/core:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
         "//pkg/client/typed/discovery/fake:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go

@@ -17,7 +17,6 @@ limitations under the License.
 package fake
 
 import (
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
@@ -48,7 +47,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go

@@ -18,7 +18,6 @@ package v1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type BatchV1Interface interface {
 	JobsGetter
 }
 
-// BatchV1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// BatchV1Client is used to interact with features provided by the batch group.
 type BatchV1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if batch/v1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("batch/v1 is not enabled")
 	}
 	config.APIPath = "/apis"

federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD

@@ -25,7 +25,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go

@@ -18,7 +18,6 @@ package v1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -34,7 +33,7 @@ type CoreV1Interface interface {
 	ServicesGetter
 }
 
-// CoreV1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// CoreV1Client is used to interact with features provided by the  group.
 type CoreV1Client struct {
 	restClient restclient.Interface
 }
@@ -93,7 +92,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if /v1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("/v1 is not enabled")
 	}
 	config.APIPath = "/api"

federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD

@@ -25,7 +25,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go

@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -33,7 +32,7 @@ type ExtensionsV1beta1Interface interface {
 	ReplicaSetsGetter
 }
 
-// ExtensionsV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// ExtensionsV1beta1Client is used to interact with features provided by the extensions group.
 type ExtensionsV1beta1Client struct {
 	restClient restclient.Interface
 }
@@ -88,7 +87,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if extensions/v1beta1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("extensions/v1beta1 is not enabled")
 	}
 	config.APIPath = "/apis"

federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go

@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type FederationV1beta1Interface interface {
 	ClustersGetter
 }
 
-// FederationV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// FederationV1beta1Client is used to interact with features provided by the federation group.
 type FederationV1beta1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if federation/v1beta1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("federation/v1beta1 is not enabled")
 	}
 	config.APIPath = "/apis"

federation/client/clientset_generated/federation_internalclientset/fake/BUILD

@@ -28,7 +28,6 @@ go_library(
         "//pkg/client/testing/core:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
         "//pkg/client/typed/discovery/fake:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go

@@ -17,7 +17,6 @@ limitations under the License.
 package fake
 
 import (
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset"
@@ -48,7 +47,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/apis/batch:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go

@@ -17,7 +17,6 @@ limitations under the License.
 package internalversion
 
 import (
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	api "k8s.io/kubernetes/pkg/api"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 )
@@ -27,7 +26,7 @@ type BatchInterface interface {
 	JobsGetter
 }
 
-// BatchClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// BatchClient is used to interact with features provided by the batch group.
 type BatchClient struct {
 	restClient restclient.Interface
 }
@@ -66,7 +65,7 @@ func New(c restclient.Interface) *BatchClient {
 
 func setConfigDefaults(config *restclient.Config) error {
 	// if batch group is not registered, return an error
-	g, err := registered.Group("batch")
+	g, err := api.Registry.Group("batch")
 	if err != nil {
 		return err
 	}

federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD

@@ -24,7 +24,6 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go

@@ -17,7 +17,6 @@ limitations under the License.
 package internalversion
 
 import (
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	api "k8s.io/kubernetes/pkg/api"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 )
@@ -31,7 +30,7 @@ type CoreInterface interface {
 	ServicesGetter
 }
 
-// CoreClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// CoreClient is used to interact with features provided by the  group.
 type CoreClient struct {
 	restClient restclient.Interface
 }
@@ -86,7 +85,7 @@ func New(c restclient.Interface) *CoreClient {
 
 func setConfigDefaults(config *restclient.Config) error {
 	// if core group is not registered, return an error
-	g, err := registered.Group("")
+	g, err := api.Registry.Group("")
 	if err != nil {
 		return err
 	}

federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD

@@ -23,7 +23,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go

@@ -17,7 +17,6 @@ limitations under the License.
 package internalversion
 
 import (
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	api "k8s.io/kubernetes/pkg/api"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 )
@@ -30,7 +29,7 @@ type ExtensionsInterface interface {
 	ReplicaSetsGetter
 }
 
-// ExtensionsClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// ExtensionsClient is used to interact with features provided by the extensions group.
 type ExtensionsClient struct {
 	restClient restclient.Interface
 }
@@ -81,7 +80,7 @@ func New(c restclient.Interface) *ExtensionsClient {
 
 func setConfigDefaults(config *restclient.Config) error {
 	// if extensions group is not registered, return an error
-	g, err := registered.Group("extensions")
+	g, err := api.Registry.Group("extensions")
 	if err != nil {
 		return err
 	}

federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//federation/apis/federation:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go

@@ -17,7 +17,6 @@ limitations under the License.
 package internalversion
 
 import (
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	api "k8s.io/kubernetes/pkg/api"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
 )
@@ -27,7 +26,7 @@ type FederationInterface interface {
 	ClustersGetter
 }
 
-// FederationClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// FederationClient is used to interact with features provided by the federation group.
 type FederationClient struct {
 	restClient restclient.Interface
 }
@@ -66,7 +65,7 @@ func New(c restclient.Interface) *FederationClient {
 
 func setConfigDefaults(config *restclient.Config) error {
 	// if federation group is not registered, return an error
-	g, err := registered.Group("federation")
+	g, err := api.Registry.Group("federation")
 	if err != nil {
 		return err
 	}

federation/cmd/federation-apiserver/app/BUILD

@@ -64,7 +64,6 @@ go_library(
         "//vendor:github.com/pborman/uuid",
         "//vendor:github.com/spf13/cobra",
         "//vendor:github.com/spf13/pflag",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/errors",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

federation/cmd/federation-apiserver/app/batch.go

@@ -18,7 +18,6 @@ package app
 
 import (
 	"github.com/golang/glog"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/apis/batch"
@@ -35,13 +34,13 @@ func installBatchAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.R
 		"jobs":        jobStorage.Job,
 		"jobs/status": jobStorage.Status,
 	}
-	batchGroupMeta := registered.GroupOrDie(batch.GroupName)
+	batchGroupMeta := api.Registry.GroupOrDie(batch.GroupName)
 	apiGroupInfo := genericapiserver.APIGroupInfo{
 		GroupMeta: *batchGroupMeta,
 		VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
 			"v1": batchResources,
 		},
-		OptionsExternalVersion: &registered.GroupOrDie(api.GroupName).GroupVersion,
+		OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
 		Scheme:                 api.Scheme,
 		ParameterCodec:         api.ParameterCodec,
 		NegotiatedSerializer:   api.Codecs,

federation/cmd/federation-apiserver/app/core.go

@@ -26,11 +26,11 @@ import (
 	// TODO(nikhiljindal): Fix this by ensuring that pkg/api/install and federation/apis/core/install do not conflict with each other.
 	_ "k8s.io/kubernetes/pkg/api/install"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/federation/apis/core"
 	_ "k8s.io/kubernetes/federation/apis/core/install"
 	"k8s.io/kubernetes/federation/apis/core/v1"
 	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/genericapiserver"
 	configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage"
@@ -58,13 +58,13 @@ func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPI
 		"events":              eventStore,
 		"configmaps":          configMapStore,
 	}
-	coreGroupMeta := registered.GroupOrDie(core.GroupName)
+	coreGroupMeta := api.Registry.GroupOrDie(core.GroupName)
 	apiGroupInfo := genericapiserver.APIGroupInfo{
 		GroupMeta: *coreGroupMeta,
 		VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
 			v1.SchemeGroupVersion.Version: coreResources,
 		},
-		OptionsExternalVersion: &registered.GroupOrDie(core.GroupName).GroupVersion,
+		OptionsExternalVersion: &api.Registry.GroupOrDie(core.GroupName).GroupVersion,
 		Scheme:                 core.Scheme,
 		ParameterCodec:         core.ParameterCodec,
 		NegotiatedSerializer:   core.Codecs,

federation/cmd/federation-apiserver/app/extensions.go

@@ -18,7 +18,6 @@ package app
 
 import (
 	"github.com/golang/glog"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/apis/extensions"
@@ -50,13 +49,13 @@ func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, optsGetter gene
 		"deployments/scale":    deploymentStorage.Scale,
 		"deployments/rollback": deploymentStorage.Rollback,
 	}
-	extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName)
+	extensionsGroupMeta := api.Registry.GroupOrDie(extensions.GroupName)
 	apiGroupInfo := genericapiserver.APIGroupInfo{
 		GroupMeta: *extensionsGroupMeta,
 		VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
 			"v1beta1": extensionsResources,
 		},
-		OptionsExternalVersion: &registered.GroupOrDie(api.GroupName).GroupVersion,
+		OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
 		Scheme:                 api.Scheme,
 		ParameterCodec:         api.ParameterCodec,
 		NegotiatedSerializer:   api.Codecs,

federation/cmd/federation-apiserver/app/federation.go

@@ -19,7 +19,6 @@ package app
 import (
 	"github.com/golang/glog"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
@@ -36,13 +35,13 @@ func installFederationAPIs(g *genericapiserver.GenericAPIServer, optsGetter gene
 		"clusters":        clusterStorage,
 		"clusters/status": clusterStatusStorage,
 	}
-	federationGroupMeta := registered.GroupOrDie(federation.GroupName)
+	federationGroupMeta := api.Registry.GroupOrDie(federation.GroupName)
 	apiGroupInfo := genericapiserver.APIGroupInfo{
 		GroupMeta: *federationGroupMeta,
 		VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
 			"v1beta1": federationResources,
 		},
-		OptionsExternalVersion: &registered.GroupOrDie(api.GroupName).GroupVersion,
+		OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
 		Scheme:                 api.Scheme,
 		ParameterCodec:         api.ParameterCodec,
 		NegotiatedSerializer:   api.Codecs,

federation/cmd/genfeddocs/gen_fed_docs.go

@@ -26,7 +26,7 @@ import (
 	fedcmapp "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
 )
 
-// Note: We have a separate binary for generating federation docs and kube docs because of the way api groups are registered.
+// Note: We have a separate binary for generating federation docs and kube docs because of the way api groups are api.Registry.
 // If we import both kube-apiserver and federation-apiserver in the same binary then api groups from both kube and federation will get registered in both the apiservers
 // and hence will produce incorrect flag values.
 // We can potentially merge cmd/kubegendocs and this when we have fixed that problem.

federation/pkg/kubefed/testing/BUILD

@@ -19,7 +19,6 @@ go_library(
         "//pkg/client/unversioned/clientcmd:go_default_library",
         "//pkg/client/unversioned/clientcmd/api:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
     ],
 )

federation/pkg/kubefed/testing/testing.go

@@ -23,7 +23,6 @@ import (
 	"net/http"
 	"os"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	fedclient "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
 	"k8s.io/kubernetes/federation/pkg/kubefed/util"
@@ -175,7 +174,7 @@ func DefaultClientConfig() *restclient.Config {
 		ContentConfig: restclient.ContentConfig{
 			NegotiatedSerializer: api.Codecs,
 			ContentType:          runtime.ContentTypeJSON,
-			GroupVersion:         &registered.GroupOrDie(api.GroupName).GroupVersion,
+			GroupVersion:         &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
 		},
 	}
 }

federation/registry/cluster/BUILD

@@ -43,7 +43,6 @@ go_test(
         "//pkg/api/testing:go_default_library",
         "//pkg/fields:go_default_library",
         "//pkg/genericapiserver/api/request:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/labels",
     ],
 )

federation/registry/cluster/strategy_test.go

@@ -21,7 +21,6 @@ import (
 
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/kubernetes/federation/apis/federation"
 	"k8s.io/kubernetes/pkg/api"
@@ -156,7 +155,7 @@ func TestMatchCluster(t *testing.T) {
 
 func TestSelectableFieldLabelConversions(t *testing.T) {
 	apitesting.TestSelectableFieldLabelConversionsOfKind(t,
-		registered.GroupOrDie(federation.GroupName).GroupVersion.String(),
+		api.Registry.GroupOrDie(federation.GroupName).GroupVersion.String(),
 		"Cluster",
 		ClusterToSelectableFields(&federation.Cluster{}),
 		nil,

pkg/api/BUILD

@@ -34,6 +34,7 @@ go_library(
         "//pkg/util/rand:go_default_library",
         "//vendor:github.com/davecgh/go-spew/spew",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/labels",
@@ -93,7 +94,6 @@ go_test(
         "//vendor:github.com/spf13/pflag",
         "//vendor:github.com/ugorji/go/codec",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/api/conversion_test.go

@@ -21,7 +21,6 @@ import (
 	"math/rand"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/kubernetes/pkg/api"
@@ -45,7 +44,7 @@ func BenchmarkPodConversion(b *testing.B) {
 	scheme := api.Scheme
 	for i := 0; i < b.N; i++ {
 		pod := &items[i%width]
-		versionedObj, err := scheme.UnsafeConvertToVersion(pod, registered.GroupOrDie(api.GroupName).GroupVersion)
+		versionedObj, err := scheme.UnsafeConvertToVersion(pod, api.Registry.GroupOrDie(api.GroupName).GroupVersion)
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
@@ -69,7 +68,7 @@ func BenchmarkNodeConversion(b *testing.B) {
 	var result *api.Node
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		versionedObj, err := scheme.UnsafeConvertToVersion(&node, registered.GroupOrDie(api.GroupName).GroupVersion)
+		versionedObj, err := scheme.UnsafeConvertToVersion(&node, api.Registry.GroupOrDie(api.GroupName).GroupVersion)
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
@@ -99,7 +98,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
 	var result *api.ReplicationController
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		versionedObj, err := scheme.UnsafeConvertToVersion(&replicationController, registered.GroupOrDie(api.GroupName).GroupVersion)
+		versionedObj, err := scheme.UnsafeConvertToVersion(&replicationController, api.Registry.GroupOrDie(api.GroupName).GroupVersion)
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}

pkg/api/copy_test.go

@@ -22,7 +22,6 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/kubernetes/pkg/api"
@@ -34,7 +33,7 @@ import (
 
 func TestDeepCopyApiObjects(t *testing.T) {
 	for i := 0; i < *fuzzIters; i++ {
-		for _, version := range []schema.GroupVersion{testapi.Default.InternalGroupVersion(), registered.GroupOrDie(api.GroupName).GroupVersion} {
+		for _, version := range []schema.GroupVersion{testapi.Default.InternalGroupVersion(), api.Registry.GroupOrDie(api.GroupName).GroupVersion} {
 			f := apitesting.FuzzerFor(t, version, rand.NewSource(rand.Int63()))
 			for kind := range api.Scheme.KnownTypes(version) {
 				doDeepCopyTest(t, version.WithKind(kind), f)
@@ -83,7 +82,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer)
 
 func TestDeepCopySingleType(t *testing.T) {
 	for i := 0; i < *fuzzIters; i++ {
-		for _, version := range []schema.GroupVersion{testapi.Default.InternalGroupVersion(), registered.GroupOrDie(api.GroupName).GroupVersion} {
+		for _, version := range []schema.GroupVersion{testapi.Default.InternalGroupVersion(), api.Registry.GroupOrDie(api.GroupName).GroupVersion} {
 			f := apitesting.FuzzerFor(t, version, rand.NewSource(rand.Int63()))
 			doDeepCopyTest(t, version.WithKind("Pod"), f)
 		}

pkg/api/install/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apimachinery",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
@@ -32,7 +31,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",

pkg/api/install/install.go

@@ -25,7 +25,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apimachinery"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -41,10 +40,10 @@ var accessor = meta.NewAccessor()
 var availableVersions = []schema.GroupVersion{v1.SchemeGroupVersion}
 
 func init() {
-	registered.RegisterVersions(availableVersions)
+	api.Registry.RegisterVersions(availableVersions)
 	externalVersions := []schema.GroupVersion{}
 	for _, v := range availableVersions {
-		if registered.IsAllowedVersion(v) {
+		if api.Registry.IsAllowedVersion(v) {
 			externalVersions = append(externalVersions, v)
 		}
 	}
@@ -53,7 +52,7 @@ func init() {
 		return
 	}
 
-	if err := registered.EnableVersions(externalVersions...); err != nil {
+	if err := api.Registry.EnableVersions(externalVersions...); err != nil {
 		glog.V(4).Infof("%v", err)
 		return
 	}
@@ -65,8 +64,8 @@ func init() {
 
 // TODO: enableVersions should be centralized rather than spread in each API
 // group.
-// We can combine registered.RegisterVersions, registered.EnableVersions and
-// registered.RegisterGroup once we have moved enableVersions there.
+// We can combine api.Registry.RegisterVersions, api.Registry.EnableVersions and
+// api.Registry.RegisterGroup once we have moved enableVersions there.
 func enableVersions(externalVersions []schema.GroupVersion) error {
 	addVersionsToScheme(externalVersions...)
 	preferredExternalVersion := externalVersions[0]
@@ -79,7 +78,7 @@ func enableVersions(externalVersions []schema.GroupVersion) error {
 		InterfacesFor: interfacesFor,
 	}
 
-	if err := registered.RegisterGroup(groupMeta); err != nil {
+	if err := api.Registry.RegisterGroup(groupMeta); err != nil {
 		return err
 	}
 	return nil
@@ -125,7 +124,7 @@ func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error)
 			MetadataAccessor: accessor,
 		}, nil
 	default:
-		g, _ := registered.Group(api.GroupName)
+		g, _ := api.Registry.Group(api.GroupName)
 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
 	}
 }
@@ -138,7 +137,7 @@ func addVersionsToScheme(externalVersions ...schema.GroupVersion) {
 	}
 	// add the enabled external versions to Scheme
 	for _, v := range externalVersions {
-		if !registered.IsEnabledVersion(v) {
+		if !api.Registry.IsEnabledVersion(v) {
 			glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v)
 			continue
 		}

pkg/api/install/install_test.go

@@ -21,7 +21,6 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -52,7 +51,7 @@ func TestCodec(t *testing.T) {
 	pod := internal.Pod{}
 	// We do want to use package registered rather than testapi here, because we
 	// want to test if the package install and package registered work as expected.
-	data, err := runtime.Encode(internal.Codecs.LegacyCodec(registered.GroupOrDie(internal.GroupName).GroupVersion), &pod)
+	data, err := runtime.Encode(internal.Codecs.LegacyCodec(internal.Registry.GroupOrDie(internal.GroupName).GroupVersion), &pod)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -60,17 +59,17 @@ func TestCodec(t *testing.T) {
 	if err := json.Unmarshal(data, &other); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if other.APIVersion != registered.GroupOrDie(internal.GroupName).GroupVersion.Version || other.Kind != "Pod" {
+	if other.APIVersion != internal.Registry.GroupOrDie(internal.GroupName).GroupVersion.Version || other.Kind != "Pod" {
 		t.Errorf("unexpected unmarshalled object %#v", other)
 	}
 }
 
 func TestInterfacesFor(t *testing.T) {
-	if _, err := registered.GroupOrDie(internal.GroupName).InterfacesFor(internal.SchemeGroupVersion); err == nil {
+	if _, err := internal.Registry.GroupOrDie(internal.GroupName).InterfacesFor(internal.SchemeGroupVersion); err == nil {
 		t.Fatalf("unexpected non-error: %v", err)
 	}
-	for i, version := range registered.GroupOrDie(internal.GroupName).GroupVersions {
-		if vi, err := registered.GroupOrDie(internal.GroupName).InterfacesFor(version); err != nil || vi == nil {
+	for i, version := range internal.Registry.GroupOrDie(internal.GroupName).GroupVersions {
+		if vi, err := internal.Registry.GroupOrDie(internal.GroupName).InterfacesFor(version); err != nil || vi == nil {
 			t.Fatalf("%d: unexpected result: %v", i, err)
 		}
 	}
@@ -81,16 +80,16 @@ func TestRESTMapper(t *testing.T) {
 	rcGVK := gv.WithKind("ReplicationController")
 	podTemplateGVK := gv.WithKind("PodTemplate")
 
-	if gvk, err := registered.RESTMapper().KindFor(internal.SchemeGroupVersion.WithResource("replicationcontrollers")); err != nil || gvk != rcGVK {
+	if gvk, err := internal.Registry.RESTMapper().KindFor(internal.SchemeGroupVersion.WithResource("replicationcontrollers")); err != nil || gvk != rcGVK {
 		t.Errorf("unexpected version mapping: %v %v", gvk, err)
 	}
 
-	if m, err := registered.GroupOrDie(internal.GroupName).RESTMapper.RESTMapping(podTemplateGVK.GroupKind(), ""); err != nil || m.GroupVersionKind != podTemplateGVK || m.Resource != "podtemplates" {
+	if m, err := internal.Registry.GroupOrDie(internal.GroupName).RESTMapper.RESTMapping(podTemplateGVK.GroupKind(), ""); err != nil || m.GroupVersionKind != podTemplateGVK || m.Resource != "podtemplates" {
 		t.Errorf("unexpected version mapping: %#v %v", m, err)
 	}
 
-	for _, version := range registered.GroupOrDie(internal.GroupName).GroupVersions {
-		mapping, err := registered.GroupOrDie(internal.GroupName).RESTMapper.RESTMapping(rcGVK.GroupKind(), version.Version)
+	for _, version := range internal.Registry.GroupOrDie(internal.GroupName).GroupVersions {
+		mapping, err := internal.Registry.GroupOrDie(internal.GroupName).RESTMapper.RESTMapping(rcGVK.GroupKind(), version.Version)
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)
 		}
@@ -102,7 +101,7 @@ func TestRESTMapper(t *testing.T) {
 			t.Errorf("incorrect version: %v", mapping)
 		}
 
-		interfaces, _ := registered.GroupOrDie(internal.GroupName).InterfacesFor(version)
+		interfaces, _ := internal.Registry.GroupOrDie(internal.GroupName).InterfacesFor(version)
 		if mapping.ObjectConvertor != interfaces.ObjectConvertor {
 			t.Errorf("unexpected: %#v, expected: %#v", mapping, interfaces)
 		}

pkg/api/meta_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/google/gofuzz"
 
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -77,7 +76,7 @@ func TestAccessOwnerReferences(t *testing.T) {
 }
 
 func TestAccessorImplementations(t *testing.T) {
-	for _, gv := range registered.EnabledVersions() {
+	for _, gv := range api.Registry.EnabledVersions() {
 		internalGV := schema.GroupVersion{Group: gv.Group, Version: runtime.APIVersionInternal}
 		for _, gv := range []schema.GroupVersion{gv, internalGV} {
 			for kind, knownType := range api.Scheme.KnownTypes(gv) {

pkg/api/register.go

@@ -17,12 +17,19 @@ limitations under the License.
 package api
 
 import (
+	"os"
+
+	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 )
 
+// Registry is an instance of an API registry.  This is an interim step to start removing the idea of a global
+// API registry.
+var Registry = registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS"))
+
 // Scheme is the default instance of runtime.Scheme to which types in the Kubernetes API are already registered.
 // NOTE: If you are copying this file to start a new api group, STOP! Copy the
 // extensions group instead. This Scheme is special and should appear ONLY in
@@ -65,7 +72,7 @@ func init() {
 	// TODO(lavalamp): move this call to scheme builder above.  Can't
 	// remove it from here because lots of people inappropriately rely on it
 	// (specifically the unversioned time conversion). Can't have it in
-	// both places because then it gets double registered.  Consequence of
+	// both places because then it gets double api.Registry.  Consequence of
 	// current state is that it only ever gets registered in the main
 	// api.Scheme, even though everyone that uses anything from unversioned
 	// needs these.

pkg/api/serialization_test.go

@@ -247,7 +247,7 @@ var nonRoundTrippableTypes = sets.NewString(
 
 var commonKinds = []string{"Status", "ListOptions", "DeleteOptions", "ExportOptions"}
 
-// verify all external group/versions have the common kinds registered.
+// verify all external group/versions have the common kinds api.Registry.
 func TestCommonKindsRegistered(t *testing.T) {
 	for _, kind := range commonKinds {
 		for _, group := range testapi.Groups {

pkg/api/testapi/BUILD

@@ -42,7 +42,6 @@ go_library(
         "//pkg/apis/storage:go_default_library",
         "//pkg/apis/storage/install:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer",

pkg/api/testapi/testapi.go

@@ -18,7 +18,7 @@ limitations under the License.
 //
 // TODO(lavalamp): this package is a huge disaster at the moment. I intend to
 // refactor. All code currently using this package should change:
-// 1. Declare your own registered.APIGroupRegistrationManager in your own test code.
+// 1. Declare your own api.Registry.APIGroupRegistrationManager in your own test code.
 // 2. Import the relevant install packages.
 // 3. Register the types you need, from the announced.APIGroupAnnouncementManager.
 package testapi
@@ -31,7 +31,6 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer/recognizer"
@@ -139,7 +138,7 @@ func init() {
 	}
 
 	if _, ok := Groups[api.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: api.GroupName, Version: registered.GroupOrDie(api.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: api.GroupName, Version: api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version}
 		Groups[api.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: api.SchemeGroupVersion,
@@ -148,7 +147,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[extensions.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: extensions.GroupName, Version: registered.GroupOrDie(extensions.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: extensions.GroupName, Version: api.Registry.GroupOrDie(extensions.GroupName).GroupVersion.Version}
 		Groups[extensions.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: extensions.SchemeGroupVersion,
@@ -164,7 +163,7 @@ func init() {
 			}
 			internalTypes[k] = t
 		}
-		externalGroupVersion := schema.GroupVersion{Group: autoscaling.GroupName, Version: registered.GroupOrDie(autoscaling.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: autoscaling.GroupName, Version: api.Registry.GroupOrDie(autoscaling.GroupName).GroupVersion.Version}
 		Groups[autoscaling.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: extensions.SchemeGroupVersion,
@@ -180,7 +179,7 @@ func init() {
 				break
 			}
 		}
-		externalGroupVersion := schema.GroupVersion{Group: autoscaling.GroupName, Version: registered.GroupOrDie(autoscaling.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: autoscaling.GroupName, Version: api.Registry.GroupOrDie(autoscaling.GroupName).GroupVersion.Version}
 		Groups[autoscaling.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: autoscaling.SchemeGroupVersion,
@@ -189,7 +188,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[batch.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: batch.GroupName, Version: registered.GroupOrDie(batch.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: batch.GroupName, Version: api.Registry.GroupOrDie(batch.GroupName).GroupVersion.Version}
 		Groups[batch.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: batch.SchemeGroupVersion,
@@ -198,7 +197,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[apps.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: apps.GroupName, Version: registered.GroupOrDie(apps.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: apps.GroupName, Version: api.Registry.GroupOrDie(apps.GroupName).GroupVersion.Version}
 		Groups[apps.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: extensions.SchemeGroupVersion,
@@ -207,7 +206,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[policy.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: policy.GroupName, Version: registered.GroupOrDie(policy.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: policy.GroupName, Version: api.Registry.GroupOrDie(policy.GroupName).GroupVersion.Version}
 		Groups[policy.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: policy.SchemeGroupVersion,
@@ -216,7 +215,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[federation.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: federation.GroupName, Version: registered.GroupOrDie(federation.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: federation.GroupName, Version: api.Registry.GroupOrDie(federation.GroupName).GroupVersion.Version}
 		Groups[federation.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: federation.SchemeGroupVersion,
@@ -225,7 +224,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[rbac.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: rbac.GroupName, Version: registered.GroupOrDie(rbac.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: rbac.GroupName, Version: api.Registry.GroupOrDie(rbac.GroupName).GroupVersion.Version}
 		Groups[rbac.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: rbac.SchemeGroupVersion,
@@ -234,7 +233,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[storage.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: storage.GroupName, Version: registered.GroupOrDie(storage.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: storage.GroupName, Version: api.Registry.GroupOrDie(storage.GroupName).GroupVersion.Version}
 		Groups[storage.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: storage.SchemeGroupVersion,
@@ -243,7 +242,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[certificates.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: certificates.GroupName, Version: registered.GroupOrDie(certificates.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: certificates.GroupName, Version: api.Registry.GroupOrDie(certificates.GroupName).GroupVersion.Version}
 		Groups[certificates.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: certificates.SchemeGroupVersion,
@@ -252,7 +251,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[imagepolicy.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: imagepolicy.GroupName, Version: registered.GroupOrDie(imagepolicy.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: imagepolicy.GroupName, Version: api.Registry.GroupOrDie(imagepolicy.GroupName).GroupVersion.Version}
 		Groups[imagepolicy.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: imagepolicy.SchemeGroupVersion,
@@ -261,7 +260,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[authorization.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: authorization.GroupName, Version: registered.GroupOrDie(authorization.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: authorization.GroupName, Version: api.Registry.GroupOrDie(authorization.GroupName).GroupVersion.Version}
 		Groups[authorization.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: authorization.SchemeGroupVersion,
@@ -270,7 +269,7 @@ func init() {
 		}
 	}
 	if _, ok := Groups[kubeadm.GroupName]; !ok {
-		externalGroupVersion := schema.GroupVersion{Group: kubeadm.GroupName, Version: registered.GroupOrDie(kubeadm.GroupName).GroupVersion.Version}
+		externalGroupVersion := schema.GroupVersion{Group: kubeadm.GroupName, Version: api.Registry.GroupOrDie(kubeadm.GroupName).GroupVersion.Version}
 		Groups[kubeadm.GroupName] = TestGroup{
 			externalGroupVersion: externalGroupVersion,
 			internalGroupVersion: kubeadm.SchemeGroupVersion,
@@ -358,7 +357,7 @@ func (g TestGroup) StorageCodec() runtime.Codec {
 // Converter returns the api.Scheme for the API version to test against, as set by the
 // KUBE_TEST_API env var.
 func (g TestGroup) Converter() runtime.ObjectConvertor {
-	interfaces, err := registered.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion)
+	interfaces, err := api.Registry.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion)
 	if err != nil {
 		panic(err)
 	}
@@ -368,7 +367,7 @@ func (g TestGroup) Converter() runtime.ObjectConvertor {
 // MetadataAccessor returns the MetadataAccessor for the API version to test against,
 // as set by the KUBE_TEST_API env var.
 func (g TestGroup) MetadataAccessor() meta.MetadataAccessor {
-	interfaces, err := registered.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion)
+	interfaces, err := api.Registry.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion)
 	if err != nil {
 		panic(err)
 	}
@@ -432,7 +431,7 @@ func (g TestGroup) ResourcePath(resource, namespace, name string) string {
 }
 
 func (g TestGroup) RESTMapper() meta.RESTMapper {
-	return registered.RESTMapper()
+	return api.Registry.RESTMapper()
 }
 
 // ExternalGroupVersions returns all external group versions allowed for the server.

pkg/api/validation/BUILD

@@ -34,7 +34,6 @@ go_library(
         "//vendor:github.com/exponent-io/jsonpath",
         "//vendor:github.com/golang/glog",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
         "//vendor:k8s.io/apimachinery/pkg/labels",
@@ -78,7 +77,6 @@ go_test(
         "//pkg/security/apparmor:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/ghodss/yaml",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

pkg/api/validation/events.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -64,7 +63,7 @@ func ValidateEvent(event *api.Event) field.ErrorList {
 // Check whether the kind in groupVersion is scoped at the root of the api hierarchy
 func isNamespacedKind(kind, groupVersion string) (bool, error) {
 	group := apiutil.GetGroup(groupVersion)
-	g, err := registered.Group(group)
+	g, err := api.Registry.Group(group)
 	if err != nil {
 		return false, err
 	}

pkg/api/validation/schema_test.go

@@ -24,7 +24,6 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/kubernetes/pkg/api"
@@ -37,7 +36,7 @@ import (
 )
 
 func readPod(filename string) ([]byte, error) {
-	data, err := ioutil.ReadFile("testdata/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version + "/" + filename)
+	data, err := ioutil.ReadFile("testdata/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version + "/" + filename)
 	if err != nil {
 		return nil, err
 	}

pkg/api/validation/validation_test.go

@@ -21,7 +21,6 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -2032,7 +2031,7 @@ func TestValidateEnv(t *testing.T) {
 			Name: "abc",
 			ValueFrom: &api.EnvVarSource{
 				FieldRef: &api.ObjectFieldSelector{
-					APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+					APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 					FieldPath:  "metadata.name",
 				},
 			},
@@ -2041,7 +2040,7 @@ func TestValidateEnv(t *testing.T) {
 			Name: "abc",
 			ValueFrom: &api.EnvVarSource{
 				FieldRef: &api.ObjectFieldSelector{
-					APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+					APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 					FieldPath:  "spec.nodeName",
 				},
 			},
@@ -2050,7 +2049,7 @@ func TestValidateEnv(t *testing.T) {
 			Name: "abc",
 			ValueFrom: &api.EnvVarSource{
 				FieldRef: &api.ObjectFieldSelector{
-					APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+					APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 					FieldPath:  "spec.serviceAccountName",
 				},
 			},
@@ -2104,7 +2103,7 @@ func TestValidateEnv(t *testing.T) {
 				Value: "foo",
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 						FieldPath:  "metadata.name",
 					},
 				},
@@ -2125,7 +2124,7 @@ func TestValidateEnv(t *testing.T) {
 				Name: "abc",
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 						FieldPath:  "metadata.name",
 					},
 					SecretKeyRef: &api.SecretKeySelector{
@@ -2144,7 +2143,7 @@ func TestValidateEnv(t *testing.T) {
 				Name: "some_var_name",
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 						FieldPath:  "metadata.name",
 					},
 					ConfigMapKeyRef: &api.ConfigMapKeySelector{
@@ -2163,7 +2162,7 @@ func TestValidateEnv(t *testing.T) {
 				Name: "abc",
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 						FieldPath:  "metadata.name",
 					},
 					SecretKeyRef: &api.SecretKeySelector{
@@ -2188,7 +2187,7 @@ func TestValidateEnv(t *testing.T) {
 				Name: "abc",
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 					},
 				},
 			}},
@@ -2213,7 +2212,7 @@ func TestValidateEnv(t *testing.T) {
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
 						FieldPath:  "metadata.whoops",
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 					},
 				},
 			}},
@@ -2252,7 +2251,7 @@ func TestValidateEnv(t *testing.T) {
 				ValueFrom: &api.EnvVarSource{
 					FieldRef: &api.ObjectFieldSelector{
 						FieldPath:  "status.phase",
-						APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(),
+						APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(),
 					},
 				},
 			}},

pkg/apimachinery/announced/group_factory.go

@@ -236,10 +236,10 @@ func (gmf *GroupMetaFactory) Enable(m *registered.APIRegistrationManager, scheme
 // It's really bad that this is called in init() methods, but supporting this
 // temporarily lets us do the change incrementally.
 func (gmf *GroupMetaFactory) RegisterAndEnable() error {
-	if err := gmf.Register(registered.DefaultAPIRegistrationManager); err != nil {
+	if err := gmf.Register(api.Registry); err != nil {
 		return err
 	}
-	if err := gmf.Enable(registered.DefaultAPIRegistrationManager, api.Scheme); err != nil {
+	if err := gmf.Enable(api.Registry, api.Scheme); err != nil {
 		return err
 	}
 

pkg/apimachinery/tests/BUILD

@@ -31,7 +31,6 @@ go_test(
         "//pkg/apis/extensions:go_default_library",
         "//vendor:github.com/google/gofuzz",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/apimachinery/tests/apis_meta_v1_unstructed_unstructure_test.go

@@ -23,7 +23,6 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -34,7 +33,7 @@ import (
 )
 
 func TestDecodeUnstructured(t *testing.T) {
-	groupVersionString := registered.GroupOrDie(api.GroupName).GroupVersion.String()
+	groupVersionString := api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()
 	rawJson := fmt.Sprintf(`{"kind":"Pod","apiVersion":"%s","metadata":{"name":"test"}}`, groupVersionString)
 	pl := &api.List{
 		Items: []runtime.Object{

pkg/apimachinery/tests/runtime_helper_test.go

@@ -19,7 +19,6 @@ package tests
 import (
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
@@ -30,8 +29,8 @@ func TestDecodeList(t *testing.T) {
 		Items: []runtime.Object{
 			&api.Pod{ObjectMeta: api.ObjectMeta{Name: "1"}},
 			&runtime.Unknown{
-				TypeMeta:    runtime.TypeMeta{Kind: "Pod", APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String()},
-				Raw:         []byte(`{"kind":"Pod","apiVersion":"` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `","metadata":{"name":"test"}}`),
+				TypeMeta:    runtime.TypeMeta{Kind: "Pod", APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()},
+				Raw:         []byte(`{"kind":"Pod","apiVersion":"` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `","metadata":{"name":"test"}}`),
 				ContentType: runtime.ContentTypeJSON,
 			},
 		},

pkg/apis/abac/register.go

@@ -27,7 +27,7 @@ const GroupName = "abac.authorization.kubernetes.io"
 
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
 
-// Scheme is the default instance of runtime.Scheme to which types in the abac API group are registered.
+// Scheme is the default instance of runtime.Scheme to which types in the abac API group are api.Registry.
 // TODO: remove this, abac should not have its own scheme.
 var Scheme = runtime.NewScheme()
 

pkg/client/cache/BUILD

@@ -92,7 +92,6 @@ go_test(
         "//pkg/util/clock:go_default_library",
         "//pkg/util/testing:go_default_library",
         "//vendor:github.com/google/gofuzz",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/client/cache/listwatch_test.go

@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/v1"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -60,7 +60,7 @@ func buildLocation(resourcePath string, query url.Values) string {
 }
 
 func TestListWatchesCanList(t *testing.T) {
-	fieldSelectorQueryParamName := metav1.FieldSelectorQueryParam(registered.GroupOrDie(v1.GroupName).GroupVersion.String())
+	fieldSelectorQueryParamName := metav1.FieldSelectorQueryParam(api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String())
 	table := []struct {
 		location      string
 		resource      string
@@ -101,7 +101,7 @@ func TestListWatchesCanList(t *testing.T) {
 		}
 		server := httptest.NewServer(&handler)
 		defer server.Close()
-		client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &registered.GroupOrDie(v1.GroupName).GroupVersion}})
+		client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}})
 		lw := NewListWatchFromClient(client.Core().RESTClient(), item.resource, item.namespace, item.fieldSelector)
 		// This test merely tests that the correct request is made.
 		lw.List(v1.ListOptions{})
@@ -110,7 +110,7 @@ func TestListWatchesCanList(t *testing.T) {
 }
 
 func TestListWatchesCanWatch(t *testing.T) {
-	fieldSelectorQueryParamName := metav1.FieldSelectorQueryParam(registered.GroupOrDie(v1.GroupName).GroupVersion.String())
+	fieldSelectorQueryParamName := metav1.FieldSelectorQueryParam(api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String())
 	table := []struct {
 		rv            string
 		location      string
@@ -167,7 +167,7 @@ func TestListWatchesCanWatch(t *testing.T) {
 		}
 		server := httptest.NewServer(&handler)
 		defer server.Close()
-		client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &registered.GroupOrDie(v1.GroupName).GroupVersion}})
+		client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}})
 		lw := NewListWatchFromClient(client.Core().RESTClient(), item.resource, item.namespace, item.fieldSelector)
 		// This test merely tests that the correct request is made.
 		lw.Watch(v1.ListOptions{ResourceVersion: item.rv})

pkg/client/clientset_generated/clientset/BUILD

@@ -16,6 +16,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
+        "//pkg/api:go_default_library",
         "//pkg/api/install:go_default_library",
         "//pkg/apis/apps/install:go_default_library",
         "//pkg/apis/authentication/install:go_default_library",
@@ -44,7 +45,6 @@ go_library(
         "//pkg/util/flowcontrol:go_default_library",
         "//plugin/pkg/client/auth:go_default_library",
         "//vendor:github.com/golang/glog",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
     ],
 )
 

pkg/client/clientset_generated/clientset/fake/BUILD

@@ -44,7 +44,6 @@ go_library(
         "//pkg/client/testing/core:go_default_library",
         "//pkg/client/typed/discovery:go_default_library",
         "//pkg/client/typed/discovery/fake:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",
     ],

pkg/client/clientset_generated/clientset/fake/clientset_generated.go

@@ -17,7 +17,6 @@ limitations under the License.
 package fake
 
 import (
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/kubernetes/pkg/api"
@@ -64,7 +63,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	}
 
 	fakePtr := core.Fake{}
-	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
 
 	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
 

pkg/client/clientset_generated/clientset/import_known_versions.go

@@ -20,7 +20,7 @@ package clientset
 import (
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/apimachinery/registered"
+	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/apps/install"
 	_ "k8s.io/kubernetes/pkg/apis/authentication/install"
@@ -35,7 +35,7 @@ import (
 )
 
 func init() {
-	if missingVersions := registered.ValidateEnvRequestedVersions(); len(missingVersions) != 0 {
+	if missingVersions := api.Registry.ValidateEnvRequestedVersions(); len(missingVersions) != 0 {
 		panic(fmt.Sprintf("KUBE_API_VERSIONS contains versions that are not installed: %q.", missingVersions))
 	}
 }

pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/apps/v1beta1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go

@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type AppsV1beta1Interface interface {
 	StatefulSetsGetter
 }
 
-// AppsV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// AppsV1beta1Client is used to interact with features provided by the apps group.
 type AppsV1beta1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if apps/v1beta1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("apps/v1beta1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/apis/authentication/v1beta1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
     ],

pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go

@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type AuthenticationV1beta1Interface interface {
 	TokenReviewsGetter
 }
 
-// AuthenticationV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// AuthenticationV1beta1Client is used to interact with features provided by the authentication.k8s.io group.
 type AuthenticationV1beta1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if authentication.k8s.io/v1beta1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("authentication.k8s.io/v1beta1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD

@@ -25,7 +25,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/apis/authorization/v1beta1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
     ],

pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go

@@ -18,7 +18,6 @@ package v1beta1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -32,7 +31,7 @@ type AuthorizationV1beta1Interface interface {
 	SubjectAccessReviewsGetter
 }
 
-// AuthorizationV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// AuthorizationV1beta1Client is used to interact with features provided by the authorization.k8s.io group.
 type AuthorizationV1beta1Client struct {
 	restClient restclient.Interface
 }
@@ -83,7 +82,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if authorization.k8s.io/v1beta1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("authorization.k8s.io/v1beta1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go

@@ -18,7 +18,6 @@ package v1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type AutoscalingV1Interface interface {
 	HorizontalPodAutoscalersGetter
 }
 
-// AutoscalingV1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// AutoscalingV1Client is used to interact with features provided by the autoscaling group.
 type AutoscalingV1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if autoscaling/v1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("autoscaling/v1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD

@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch/v1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go

@@ -18,7 +18,6 @@ package v1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type BatchV1Interface interface {
 	JobsGetter
 }
 
-// BatchV1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// BatchV1Client is used to interact with features provided by the batch group.
 type BatchV1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if batch/v1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("batch/v1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD

@@ -22,7 +22,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch/v2alpha1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go

@@ -18,7 +18,6 @@ package v2alpha1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -31,7 +30,7 @@ type BatchV2alpha1Interface interface {
 	JobsGetter
 }
 
-// BatchV2alpha1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// BatchV2alpha1Client is used to interact with features provided by the batch group.
 type BatchV2alpha1Client struct {
 	restClient restclient.Interface
 }
@@ -78,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if batch/v2alpha1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("batch/v2alpha1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/BUILD

@@ -22,7 +22,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/certificates/v1alpha1:go_default_library",
         "//pkg/client/restclient:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",

pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/certificates_client.go

@@ -18,7 +18,6 @@ package v1alpha1
 
 import (
 	fmt "fmt"
-	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	api "k8s.io/kubernetes/pkg/api"
@@ -30,7 +29,7 @@ type CertificatesV1alpha1Interface interface {
 	CertificateSigningRequestsGetter
 }
 
-// CertificatesV1alpha1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
+// CertificatesV1alpha1Client is used to interact with features provided by the certificates.k8s.io group.
 type CertificatesV1alpha1Client struct {
 	restClient restclient.Interface
 }
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
 		return err
 	}
 	// if certificates.k8s.io/v1alpha1 is not enabled, return an error
-	if !registered.IsEnabledVersion(gv) {
+	if !api.Registry.IsEnabledVersion(gv) {
 		return fmt.Errorf("certificates.k8s.io/v1alpha1 is not enabled")
 	}
 	config.APIPath = "/apis"

pkg/client/clientset_generated/clientset/typed/core/v1/BUILD

@@ -42,7 +42,6 @@ go_library(
         "//pkg/apis/policy/v1beta1:go_default_library",
         "//pkg/client/restclient:go_default_library",
         "//pkg/fields:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",