diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD index 879c208f07..492eb3cccd 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD +++ b/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", ], diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index 5764479e7c..e6c2d4cf05 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/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)) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD index 5239ca78f9..78a40fe32d 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD +++ b/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", diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go index a1cb048273..b4b98713fd 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go +++ b/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" diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD index bab12ed3b3..978512eb2f 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/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", ], diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index a0278c7c75..55fd774f8a 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/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)) diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD index 6b772364ee..7f4d283ead 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD +++ b/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", ], diff --git a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go index 60b14f32b2..c936c16c03 100644 --- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go +++ b/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 } diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index d94fd8ccbe..25a8765d28 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/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", diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 150693720f..13009a78cf 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/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() diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go index 6b40c5be00..8c6d850097 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go +++ b/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)) diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go index 703a9ecea3..7dabf1eabe 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go +++ b/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$ diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD index 91f354647d..eceadc59e6 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD +++ b/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", diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go index 086e5155e4..36e5805699 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go +++ b/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) } } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD index 8e0c003a87..c5352e7d01 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD +++ b/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", ], diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go index a57e571ecf..31b700e953 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go +++ b/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)) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD index a819f05229..145b4e2c6b 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD +++ b/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", ], diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go index 57f8f58abc..730ae66c48 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go +++ b/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 } diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index dbbf1fef7d..9ee2123276 100644 --- a/examples/apiserver/BUILD +++ b/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", ], diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 7bcf231825..13401a1135 100644 --- a/examples/apiserver/apiserver.go +++ b/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) } diff --git a/examples/https-nginx/BUILD b/examples/https-nginx/BUILD index f36203090c..5a9022d805 100644 --- a/examples/https-nginx/BUILD +++ b/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", ], ) diff --git a/examples/https-nginx/make_secret.go b/examples/https-nginx/make_secret.go index 364bd1a2b6..055c3cee7f 100644 --- a/examples/https-nginx/make_secret.go +++ b/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)) } diff --git a/examples/sharing-clusters/BUILD b/examples/sharing-clusters/BUILD index 5db87ff979..80d52acfb5 100644 --- a/examples/sharing-clusters/BUILD +++ b/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", ], ) diff --git a/examples/sharing-clusters/make_secret.go b/examples/sharing-clusters/make_secret.go index edce84fad3..88cd8aeaad 100644 --- a/examples/sharing-clusters/make_secret.go +++ b/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)) } diff --git a/federation/apis/core/install/BUILD b/federation/apis/core/install/BUILD index 51a990c659..900bffa133 100644 --- a/federation/apis/core/install/BUILD +++ b/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", diff --git a/federation/apis/core/install/install.go b/federation/apis/core/install/install.go index 23ee0bfd18..ef75d2f405 100644 --- a/federation/apis/core/install/install.go +++ b/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 } diff --git a/federation/apis/federation/install/BUILD b/federation/apis/federation/install/BUILD index e04cef33a2..4af84a9f2f 100644 --- a/federation/apis/federation/install/BUILD +++ b/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", ], diff --git a/federation/apis/federation/install/install.go b/federation/apis/federation/install/install.go index 9c0eda9fda..2396cf2b54 100644 --- a/federation/apis/federation/install/install.go +++ b/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 } diff --git a/federation/apis/federation/install/install_test.go b/federation/apis/federation/install/install_test.go index 2076f8e05a..1f6653ad24 100644 --- a/federation/apis/federation/install/install_test.go +++ b/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) } diff --git a/federation/client/clientset_generated/federation_clientset/fake/BUILD b/federation/client/clientset_generated/federation_clientset/fake/BUILD index 2024904298..e2e25c4a7d 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/BUILD +++ b/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", ], diff --git a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go index 502d1588e7..eeaea4cfd1 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go +++ b/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)) diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD index c5c63d0e34..eb4f7d4bd9 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD +++ b/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", diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go index 414c87a857..def6f1e39a 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go +++ b/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" diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD index e5a72c5d6e..31b0e4dd51 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD +++ b/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", diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go index a87f83a5b0..93245f8bdd 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go +++ b/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" diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD index dd48a71411..e694c46d71 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD +++ b/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", diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go index 2384c6ab3a..5994f8bf6f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go +++ b/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" diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD index 4c487e270d..1e7808effa 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD +++ b/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", diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go index d78137971b..db28a80c43 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go +++ b/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" diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/fake/BUILD index f261f6b4d4..7f6ab8ad51 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/BUILD +++ b/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", ], diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go index 297ee700bd..fefa283e11 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go +++ b/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)) diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD index 18c29ccf0e..63d94b637b 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD +++ b/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", ], diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go index 37a55bf8c8..9488779067 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go +++ b/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 } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD index aa9d187f2f..41210f53b9 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD +++ b/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", ], diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go index fa7b1c5477..e4b87f9597 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go +++ b/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 } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD index 73f1cae77d..7e9a88ed60 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD +++ b/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", ], diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go index ec6455bb65..86065d6c18 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go +++ b/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 } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD index 298a67e35e..8957c4b7e0 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD +++ b/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", ], diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go index c8f8fa8746..17367d1244 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go +++ b/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 } diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 32030c74c1..290f5790f0 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/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", diff --git a/federation/cmd/federation-apiserver/app/batch.go b/federation/cmd/federation-apiserver/app/batch.go index dffd03ee63..c3fbd51018 100644 --- a/federation/cmd/federation-apiserver/app/batch.go +++ b/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: ®istered.GroupOrDie(api.GroupName).GroupVersion, + OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, Scheme: api.Scheme, ParameterCodec: api.ParameterCodec, NegotiatedSerializer: api.Codecs, diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go index 951e1fa768..953ea84cd2 100644 --- a/federation/cmd/federation-apiserver/app/core.go +++ b/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: ®istered.GroupOrDie(core.GroupName).GroupVersion, + OptionsExternalVersion: &api.Registry.GroupOrDie(core.GroupName).GroupVersion, Scheme: core.Scheme, ParameterCodec: core.ParameterCodec, NegotiatedSerializer: core.Codecs, diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index ea05235470..53100993c9 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/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: ®istered.GroupOrDie(api.GroupName).GroupVersion, + OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, Scheme: api.Scheme, ParameterCodec: api.ParameterCodec, NegotiatedSerializer: api.Codecs, diff --git a/federation/cmd/federation-apiserver/app/federation.go b/federation/cmd/federation-apiserver/app/federation.go index 120578f177..527dc12dc5 100644 --- a/federation/cmd/federation-apiserver/app/federation.go +++ b/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: ®istered.GroupOrDie(api.GroupName).GroupVersion, + OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, Scheme: api.Scheme, ParameterCodec: api.ParameterCodec, NegotiatedSerializer: api.Codecs, diff --git a/federation/cmd/genfeddocs/gen_fed_docs.go b/federation/cmd/genfeddocs/gen_fed_docs.go index c8bdf32293..8910ea01eb 100644 --- a/federation/cmd/genfeddocs/gen_fed_docs.go +++ b/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. diff --git a/federation/pkg/kubefed/testing/BUILD b/federation/pkg/kubefed/testing/BUILD index 9a07e4aa2c..211c87bc53 100644 --- a/federation/pkg/kubefed/testing/BUILD +++ b/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", ], ) diff --git a/federation/pkg/kubefed/testing/testing.go b/federation/pkg/kubefed/testing/testing.go index e30536b9f6..10f91de45f 100644 --- a/federation/pkg/kubefed/testing/testing.go +++ b/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: ®istered.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, }, } } diff --git a/federation/registry/cluster/BUILD b/federation/registry/cluster/BUILD index 42e42fabe9..fad544cf05 100644 --- a/federation/registry/cluster/BUILD +++ b/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", ], ) diff --git a/federation/registry/cluster/strategy_test.go b/federation/registry/cluster/strategy_test.go index 7c82441f9b..fef835947d 100644 --- a/federation/registry/cluster/strategy_test.go +++ b/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, diff --git a/pkg/api/BUILD b/pkg/api/BUILD index 3eb82eac90..3c05143f3c 100644 --- a/pkg/api/BUILD +++ b/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", diff --git a/pkg/api/conversion_test.go b/pkg/api/conversion_test.go index 0026339897..da651a466c 100644 --- a/pkg/api/conversion_test.go +++ b/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) } diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go index 6af321e29b..5393a6d02a 100644 --- a/pkg/api/copy_test.go +++ b/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) } diff --git a/pkg/api/install/BUILD b/pkg/api/install/BUILD index 59d60015bf..245f0bba4d 100644 --- a/pkg/api/install/BUILD +++ b/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", diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go index 975e7ca538..9fcaa1b998 100644 --- a/pkg/api/install/install.go +++ b/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 } diff --git a/pkg/api/install/install_test.go b/pkg/api/install/install_test.go index 41126c09bd..582d97bf90 100644 --- a/pkg/api/install/install_test.go +++ b/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) } diff --git a/pkg/api/meta_test.go b/pkg/api/meta_test.go index e9d534781f..cf876f918e 100644 --- a/pkg/api/meta_test.go +++ b/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) { diff --git a/pkg/api/register.go b/pkg/api/register.go index 02fb64e3db..1847e0c057 100644 --- a/pkg/api/register.go +++ b/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. diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index e6a39e9f37..f635cd9da1 100644 --- a/pkg/api/serialization_test.go +++ b/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 { diff --git a/pkg/api/testapi/BUILD b/pkg/api/testapi/BUILD index 723e53201a..24e2d85450 100644 --- a/pkg/api/testapi/BUILD +++ b/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", diff --git a/pkg/api/testapi/testapi.go b/pkg/api/testapi/testapi.go index 2d3735e6fe..0772b18c33 100644 --- a/pkg/api/testapi/testapi.go +++ b/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. diff --git a/pkg/api/validation/BUILD b/pkg/api/validation/BUILD index f3dcd06fb8..5e7a2acd9c 100644 --- a/pkg/api/validation/BUILD +++ b/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", diff --git a/pkg/api/validation/events.go b/pkg/api/validation/events.go index f2d185df7e..ac5cebfb34 100644 --- a/pkg/api/validation/events.go +++ b/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 } diff --git a/pkg/api/validation/schema_test.go b/pkg/api/validation/schema_test.go index c6f4fb8f1d..760fb2c380 100644 --- a/pkg/api/validation/schema_test.go +++ b/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 } diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index 7224d862b5..9274dd217b 100644 --- a/pkg/api/validation/validation_test.go +++ b/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(), }, }, }}, diff --git a/pkg/apimachinery/announced/group_factory.go b/pkg/apimachinery/announced/group_factory.go index bdcde98ba1..400f1c132c 100644 --- a/pkg/apimachinery/announced/group_factory.go +++ b/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 } diff --git a/pkg/apimachinery/tests/BUILD b/pkg/apimachinery/tests/BUILD index dc58dc38b8..0ac57aedc6 100644 --- a/pkg/apimachinery/tests/BUILD +++ b/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", diff --git a/pkg/apimachinery/tests/apis_meta_v1_unstructed_unstructure_test.go b/pkg/apimachinery/tests/apis_meta_v1_unstructed_unstructure_test.go index 56f04cece4..ba5ad0ce40 100644 --- a/pkg/apimachinery/tests/apis_meta_v1_unstructed_unstructure_test.go +++ b/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{ diff --git a/pkg/apimachinery/tests/runtime_helper_test.go b/pkg/apimachinery/tests/runtime_helper_test.go index a8365d70a1..d30ae1d076 100644 --- a/pkg/apimachinery/tests/runtime_helper_test.go +++ b/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, }, }, diff --git a/pkg/apis/abac/register.go b/pkg/apis/abac/register.go index dac09f2979..bef7968d37 100644 --- a/pkg/apis/abac/register.go +++ b/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() diff --git a/pkg/client/cache/BUILD b/pkg/client/cache/BUILD index 34f97e0631..35e2e245d9 100644 --- a/pkg/client/cache/BUILD +++ b/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", diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 688b4c3f79..167a9416f3 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/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: ®istered.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: ®istered.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}) diff --git a/pkg/client/clientset_generated/clientset/BUILD b/pkg/client/clientset_generated/clientset/BUILD index aa604cb220..b5f45547e5 100644 --- a/pkg/client/clientset_generated/clientset/BUILD +++ b/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", ], ) diff --git a/pkg/client/clientset_generated/clientset/fake/BUILD b/pkg/client/clientset_generated/clientset/fake/BUILD index 1c286072a4..1e1aa74f64 100644 --- a/pkg/client/clientset_generated/clientset/fake/BUILD +++ b/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", ], diff --git a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index d92675f5b4..bb030ddf6f 100644 --- a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/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)) diff --git a/pkg/client/clientset_generated/clientset/import_known_versions.go b/pkg/client/clientset_generated/clientset/import_known_versions.go index 41a70a30bb..9cd90c556a 100644 --- a/pkg/client/clientset_generated/clientset/import_known_versions.go +++ b/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)) } } diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD index c1899c2c02..b0b3defc32 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD +++ b/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", diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go index 0409516579..535dae43d9 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD index 6eb2675e5b..96b33eecf8 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD +++ b/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", ], diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go index c449b93c42..bb60779a70 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD index 9211ad80be..9b89c253dc 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD +++ b/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", ], diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go index 93b3f15970..0768137d01 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD index 67737edb6c..8969cd7938 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD +++ b/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", diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go index 3358203587..d0aaf869b7 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD index 1f22e67779..e44f2d18fd 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD +++ b/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", diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go index 414c87a857..def6f1e39a 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD index 97e600b28f..baef93dd4c 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD +++ b/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", diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go index d44170519d..044517c295 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/BUILD index e399682919..043343ce1d 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/BUILD +++ b/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", diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/certificates_client.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/certificates_client.go index 21d09533a9..1112c55901 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1alpha1/certificates_client.go +++ b/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" diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD index 235902d906..c679f09df6 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD +++ b/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", diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go b/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go index 9cdad04ff4..ecb0454820 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go +++ b/pkg/client/clientset_generated/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" @@ -45,7 +44,7 @@ type CoreV1Interface interface { ServiceAccountsGetter } -// 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 } @@ -148,7 +147,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" diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD index 415083e1b1..7356470c6b 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/restclient:go_default_library", "//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/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go index ddc7c78c21..646cd50476 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/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" @@ -36,7 +35,7 @@ type ExtensionsV1beta1Interface interface { ThirdPartyResourcesGetter } -// 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 } @@ -103,7 +102,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" diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD index b5382c8fe1..67af08e24b 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1alpha1: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", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/policy_client.go index 652a46ad10..989faf1b8a 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1alpha1/policy_client.go @@ -19,7 +19,6 @@ package v1alpha1 import ( fmt "fmt" - registered "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" api "k8s.io/kubernetes/pkg/api" @@ -74,7 +73,7 @@ func setConfigDefaults(config *restclient.Config) error { return err } // if policy/v1alpha1 is not enabled, return an error - if !registered.IsEnabledVersion(gv) { + if !api.Registry.IsEnabledVersion(gv) { return fmt.Errorf("policy/v1alpha1 is not enabled") } config.APIPath = "/apis" diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD index 60c0af759a..f57d564a6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/policy/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", diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go index 0eb32642d0..a501ea13d3 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_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" @@ -31,7 +30,7 @@ type PolicyV1beta1Interface interface { PodDisruptionBudgetsGetter } -// PolicyV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// PolicyV1beta1Client is used to interact with features provided by the policy group. type PolicyV1beta1Client struct { restClient restclient.Interface } @@ -78,7 +77,7 @@ func setConfigDefaults(config *restclient.Config) error { return err } // if policy/v1beta1 is not enabled, return an error - if !registered.IsEnabledVersion(gv) { + if !api.Registry.IsEnabledVersion(gv) { return fmt.Errorf("policy/v1beta1 is not enabled") } config.APIPath = "/apis" diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD index 613e18e683..f0fe1154c6 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/rbac/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", diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go index 43b48cebec..52bf74a08c 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_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" @@ -33,7 +32,7 @@ type RbacV1alpha1Interface interface { RoleBindingsGetter } -// RbacV1alpha1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// RbacV1alpha1Client is used to interact with features provided by the rbac.authorization.k8s.io group. type RbacV1alpha1Client struct { restClient restclient.Interface } @@ -88,7 +87,7 @@ func setConfigDefaults(config *restclient.Config) error { return err } // if rbac.authorization.k8s.io/v1alpha1 is not enabled, return an error - if !registered.IsEnabledVersion(gv) { + if !api.Registry.IsEnabledVersion(gv) { return fmt.Errorf("rbac.authorization.k8s.io/v1alpha1 is not enabled") } config.APIPath = "/apis" diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD index 1f1a7e3223..daea28ed22 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/storage/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", diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go index 9e3ae50737..142c14a928 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_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 StorageV1beta1Interface interface { StorageClassesGetter } -// StorageV1beta1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// StorageV1beta1Client is used to interact with features provided by the storage.k8s.io group. type StorageV1beta1Client struct { restClient restclient.Interface } @@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error { return err } // if storage.k8s.io/v1beta1 is not enabled, return an error - if !registered.IsEnabledVersion(gv) { + if !api.Registry.IsEnabledVersion(gv) { return fmt.Errorf("storage.k8s.io/v1beta1 is not enabled") } config.APIPath = "/apis" diff --git a/pkg/client/clientset_generated/internalclientset/BUILD b/pkg/client/clientset_generated/internalclientset/BUILD index 6a8f6b436f..e6f83b05e1 100644 --- a/pkg/client/clientset_generated/internalclientset/BUILD +++ b/pkg/client/clientset_generated/internalclientset/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", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/fake/BUILD b/pkg/client/clientset_generated/internalclientset/fake/BUILD index a24e00908d..ccef0040cd 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/fake/BUILD @@ -42,7 +42,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", ], diff --git a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index fad375d660..a13078955d 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/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" "k8s.io/kubernetes/pkg/api" @@ -62,7 +61,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)) diff --git a/pkg/client/clientset_generated/internalclientset/import_known_versions.go b/pkg/client/clientset_generated/internalclientset/import_known_versions.go index 1249999e19..4aa24c4083 100644 --- a/pkg/client/clientset_generated/internalclientset/import_known_versions.go +++ b/pkg/client/clientset_generated/internalclientset/import_known_versions.go @@ -20,7 +20,7 @@ package internalclientset 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" @@ -36,7 +36,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)) } } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD index e53ffb7a1c..cb63b79f18 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/apps: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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go index e0015c0830..c5fa3524ae 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_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 AppsInterface interface { StatefulSetsGetter } -// AppsClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// AppsClient is used to interact with features provided by the apps group. type AppsClient struct { restClient restclient.Interface } @@ -66,7 +65,7 @@ func New(c restclient.Interface) *AppsClient { func setConfigDefaults(config *restclient.Config) error { // if apps group is not registered, return an error - g, err := registered.Group("apps") + g, err := api.Registry.Group("apps") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD index 2e543cb01e..93c17e89f9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/client/restclient:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go index e8f43d4638..ff45ce11ee 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_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 AuthenticationInterface interface { TokenReviewsGetter } -// AuthenticationClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// AuthenticationClient is used to interact with features provided by the authentication.k8s.io group. type AuthenticationClient struct { restClient restclient.Interface } @@ -66,7 +65,7 @@ func New(c restclient.Interface) *AuthenticationClient { func setConfigDefaults(config *restclient.Config) error { // if authentication group is not registered, return an error - g, err := registered.Group("authentication.k8s.io") + g, err := api.Registry.Group("authentication.k8s.io") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD index e7a9c89e9b..cccce09ff1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/client/restclient:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go index 0d0e98054f..fdda05a6db 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_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" ) @@ -29,7 +28,7 @@ type AuthorizationInterface interface { SubjectAccessReviewsGetter } -// AuthorizationClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// AuthorizationClient is used to interact with features provided by the authorization.k8s.io group. type AuthorizationClient struct { restClient restclient.Interface } @@ -76,7 +75,7 @@ func New(c restclient.Interface) *AuthorizationClient { func setConfigDefaults(config *restclient.Config) error { // if authorization group is not registered, return an error - g, err := registered.Group("authorization.k8s.io") + g, err := api.Registry.Group("authorization.k8s.io") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD index 3cc967f0ea..8c50b837de 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/autoscaling: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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go index 5c8f18d689..0384256c98 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_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 AutoscalingInterface interface { HorizontalPodAutoscalersGetter } -// AutoscalingClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// AutoscalingClient is used to interact with features provided by the autoscaling group. type AutoscalingClient struct { restClient restclient.Interface } @@ -66,7 +65,7 @@ func New(c restclient.Interface) *AutoscalingClient { func setConfigDefaults(config *restclient.Config) error { // if autoscaling group is not registered, return an error - g, err := registered.Group("autoscaling") + g, err := api.Registry.Group("autoscaling") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD index 98c1af466a..f9b956f1c4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD @@ -21,7 +21,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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go index ae9fe2cb15..6b3525b3ef 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go +++ b/pkg/client/clientset_generated/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" ) @@ -28,7 +27,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 } @@ -71,7 +70,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 } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD index ab525b5536..4f1acde58f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/certificates: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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go index 5605c7ac37..7814661579 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_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 CertificatesInterface interface { CertificateSigningRequestsGetter } -// CertificatesClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// CertificatesClient is used to interact with features provided by the certificates.k8s.io group. type CertificatesClient struct { restClient restclient.Interface } @@ -66,7 +65,7 @@ func New(c restclient.Interface) *CertificatesClient { func setConfigDefaults(config *restclient.Config) error { // if certificates group is not registered, return an error - g, err := registered.Group("certificates.k8s.io") + g, err := api.Registry.Group("certificates.k8s.io") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD index f9b7af2056..4acaab4441 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD @@ -41,7 +41,6 @@ go_library( "//pkg/api/v1: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/util/net", diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go index c455019114..39fe89d655 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go +++ b/pkg/client/clientset_generated/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" ) @@ -42,7 +41,7 @@ type CoreInterface interface { ServiceAccountsGetter } -// 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 } @@ -141,7 +140,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 } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD index 7b2a13495c..b40c089c0e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/client/restclient:go_default_library", "//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/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go index 6bcf73a5e4..b3448f7d52 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go +++ b/pkg/client/clientset_generated/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" ) @@ -34,7 +33,7 @@ type ExtensionsInterface interface { ThirdPartyResourcesGetter } -// 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 } @@ -101,7 +100,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 } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD index 8be04ef971..b70e270bce 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/policy: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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go index 908a5c61d9..dab1b40e3e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_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" ) @@ -28,7 +27,7 @@ type PolicyInterface interface { PodDisruptionBudgetsGetter } -// PolicyClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// PolicyClient is used to interact with features provided by the policy group. type PolicyClient struct { restClient restclient.Interface } @@ -71,7 +70,7 @@ func New(c restclient.Interface) *PolicyClient { func setConfigDefaults(config *restclient.Config) error { // if policy group is not registered, return an error - g, err := registered.Group("policy") + g, err := api.Registry.Group("policy") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD index d57fd23020..c5859b121f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/rbac: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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go index 1dd5ddf6c9..25a6f01eb8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_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 RbacInterface interface { RoleBindingsGetter } -// RbacClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// RbacClient is used to interact with features provided by the rbac.authorization.k8s.io group. type RbacClient struct { restClient restclient.Interface } @@ -81,7 +80,7 @@ func New(c restclient.Interface) *RbacClient { func setConfigDefaults(config *restclient.Config) error { // if rbac group is not registered, return an error - g, err := registered.Group("rbac.authorization.k8s.io") + g, err := api.Registry.Group("rbac.authorization.k8s.io") if err != nil { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD index d218cacb83..9c3e237837 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/apis/storage: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", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go index d78900a0f7..c96e84e2f0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_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 StorageInterface interface { StorageClassesGetter } -// StorageClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group. +// StorageClient is used to interact with features provided by the storage.k8s.io group. type StorageClient struct { restClient restclient.Interface } @@ -66,7 +65,7 @@ func New(c restclient.Interface) *StorageClient { func setConfigDefaults(config *restclient.Config) error { // if storage group is not registered, return an error - g, err := registered.Group("storage.k8s.io") + g, err := api.Registry.Group("storage.k8s.io") if err != nil { return err } diff --git a/pkg/client/restclient/BUILD b/pkg/client/restclient/BUILD index 2a18094aa4..d9c9fc91a0 100644 --- a/pkg/client/restclient/BUILD +++ b/pkg/client/restclient/BUILD @@ -71,7 +71,6 @@ go_test( "//pkg/util/intstr: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", diff --git a/pkg/client/restclient/client_test.go b/pkg/client/restclient/client_test.go index 70fa3f6367..3a47d843a7 100644 --- a/pkg/client/restclient/client_test.go +++ b/pkg/client/restclient/client_test.go @@ -27,7 +27,6 @@ import ( "fmt" - "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" @@ -243,7 +242,7 @@ func validate(testParam TestParam, t *testing.T, body []byte, fakeHandler *utilt t.Errorf("Unexpected mis-match. Expected %#v. Saw %#v", testParam.expStatus, statusOut) } } - fakeHandler.ValidateRequest(t, "/"+registered.GroupOrDie(api.GroupName).GroupVersion.String()+"/test", "GET", nil) + fakeHandler.ValidateRequest(t, "/"+api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()+"/test", "GET", nil) } @@ -330,7 +329,7 @@ func restClient(testServer *httptest.Server) (*RESTClient, error) { c, err := RESTClientFor(&Config{ Host: testServer.URL, ContentConfig: ContentConfig{ - GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), }, Username: "user", diff --git a/pkg/client/restclient/config_test.go b/pkg/client/restclient/config_test.go index b7d1a40605..474a4beaa2 100644 --- a/pkg/client/restclient/config_test.go +++ b/pkg/client/restclient/config_test.go @@ -25,7 +25,6 @@ import ( fuzz "github.com/google/gofuzz" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" @@ -102,10 +101,10 @@ func TestRESTClientRequires(t *testing.T) { if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err == nil { t.Errorf("unexpected non-error") } - if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}); err == nil { + if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}); err == nil { t.Errorf("unexpected non-error") } - if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err != nil { + if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err != nil { t.Errorf("unexpected error: %v", err) } } diff --git a/pkg/client/restclient/fake/BUILD b/pkg/client/restclient/fake/BUILD index a6fc357f88..04bfb6b17f 100644 --- a/pkg/client/restclient/fake/BUILD +++ b/pkg/client/restclient/fake/BUILD @@ -16,7 +16,6 @@ go_library( "//pkg/api/testapi:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/util/flowcontrol:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", ], diff --git a/pkg/client/restclient/fake/fake.go b/pkg/client/restclient/fake/fake.go index 140cca5d80..b9ea95f85c 100644 --- a/pkg/client/restclient/fake/fake.go +++ b/pkg/client/restclient/fake/fake.go @@ -22,7 +22,6 @@ import ( "net/http" "net/url" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" @@ -89,7 +88,7 @@ func (c *RESTClient) GetRateLimiter() flowcontrol.RateLimiter { func (c *RESTClient) request(verb string) *restclient.Request { config := restclient.ContentConfig{ ContentType: runtime.ContentTypeJSON, - GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: c.NegotiatedSerializer, } @@ -100,12 +99,12 @@ func (c *RESTClient) request(verb string) *restclient.Request { ns := c.NegotiatedSerializer info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON) internalVersion := schema.GroupVersion{ - Group: registered.GroupOrDie(groupName).GroupVersion.Group, + Group: api.Registry.GroupOrDie(groupName).GroupVersion.Group, Version: runtime.APIVersionInternal, } internalVersion.Version = runtime.APIVersionInternal serializers := restclient.Serializers{ - Encoder: ns.EncoderForVersion(info.Serializer, registered.GroupOrDie(api.GroupName).GroupVersion), + Encoder: ns.EncoderForVersion(info.Serializer, api.Registry.GroupOrDie(api.GroupName).GroupVersion), Decoder: ns.DecoderToVersion(info.Serializer, internalVersion), } if info.StreamSerializer != nil { diff --git a/pkg/client/restclient/request_test.go b/pkg/client/restclient/request_test.go index b71ef39847..1b2dd8d6ba 100755 --- a/pkg/client/restclient/request_test.go +++ b/pkg/client/restclient/request_test.go @@ -33,7 +33,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -94,7 +93,7 @@ func TestRequestSetsHeaders(t *testing.T) { func TestRequestWithErrorWontChange(t *testing.T) { original := Request{ err: errors.New("test"), - content: ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}, + content: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}, } r := original changed := r.Param("foo", "bar"). @@ -278,7 +277,7 @@ func (obj NotAnAPIObject) SetGroupVersionKind(gvk *schema.GroupVersionKind) {} func defaultContentConfig() ContentConfig { return ContentConfig{ - GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), } } @@ -1253,7 +1252,7 @@ func TestDoRequestNewWayReader(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz") - requestURL += "?" + metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } @@ -1293,7 +1292,7 @@ func TestDoRequestNewWayObj(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz") - requestURL += "?" + metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } diff --git a/pkg/client/restclient/url_utils_test.go b/pkg/client/restclient/url_utils_test.go index 59ea1a2040..fa99f72e5e 100644 --- a/pkg/client/restclient/url_utils_test.go +++ b/pkg/client/restclient/url_utils_test.go @@ -20,7 +20,6 @@ import ( "path" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" ) @@ -32,17 +31,17 @@ func TestValidatesHostParameter(t *testing.T) { URL string Err bool }{ - {"127.0.0.1", "", "http://127.0.0.1/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, - {"127.0.0.1:8080", "", "http://127.0.0.1:8080/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, - {"foo.bar.com", "", "http://foo.bar.com/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, - {"http://host/prefix", "", "http://host/prefix/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, - {"http://host", "", "http://host/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, - {"http://host", "/", "http://host/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, - {"http://host", "/other", "http://host/other/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"127.0.0.1", "", "http://127.0.0.1/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"127.0.0.1:8080", "", "http://127.0.0.1:8080/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"foo.bar.com", "", "http://foo.bar.com/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"http://host/prefix", "", "http://host/prefix/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"http://host", "", "http://host/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"http://host", "/", "http://host/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, + {"http://host", "/other", "http://host/other/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"host/server", "", "", true}, } for i, testCase := range testCases { - u, versionedAPIPath, err := DefaultServerURL(testCase.Host, testCase.APIPath, registered.GroupOrDie(api.GroupName).GroupVersion, false) + u, versionedAPIPath, err := DefaultServerURL(testCase.Host, testCase.APIPath, api.Registry.GroupOrDie(api.GroupName).GroupVersion, false) switch { case err == nil && testCase.Err: t.Errorf("expected error but was nil") diff --git a/pkg/client/testing/core/BUILD b/pkg/client/testing/core/BUILD index a5aee33cce..642e916cb5 100644 --- a/pkg/client/testing/core/BUILD +++ b/pkg/client/testing/core/BUILD @@ -24,7 +24,6 @@ go_library( "//pkg/fields:go_default_library", "//pkg/version:go_default_library", "//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/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/client/testing/core/fixture.go b/pkg/client/testing/core/fixture.go index e7cbec6cd9..34a0ee715c 100644 --- a/pkg/client/testing/core/fixture.go +++ b/pkg/client/testing/core/fixture.go @@ -21,11 +21,11 @@ import ( "sync" "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" "k8s.io/apimachinery/pkg/watch" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/restclient" ) @@ -414,7 +414,7 @@ func filterByNamespaceAndName(objs []runtime.Object, ns, name string) ([]runtime // returns an error if namespace is empty but gvk is a namespaced // kind, or if ns is non-empty and gvk is a namespaced kind. func checkNamespace(gvk schema.GroupVersionKind, ns string) error { - group, err := registered.Group(gvk.Group) + group, err := api.Registry.Group(gvk.Group) if err != nil { return err } diff --git a/pkg/client/typed/discovery/BUILD b/pkg/client/typed/discovery/BUILD index cf15409e3a..0f52636b8c 100644 --- a/pkg/client/typed/discovery/BUILD +++ b/pkg/client/typed/discovery/BUILD @@ -44,6 +44,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/restclient:go_default_library", @@ -51,7 +52,6 @@ go_test( "//pkg/version:go_default_library", "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/stretchr/testify/assert", - "//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/util/sets", @@ -68,7 +68,6 @@ go_test( "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/discovery: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", diff --git a/pkg/client/typed/discovery/helper_blackbox_test.go b/pkg/client/typed/discovery/helper_blackbox_test.go index 0671f3278d..bbd03be7e5 100644 --- a/pkg/client/typed/discovery/helper_blackbox_test.go +++ b/pkg/client/typed/discovery/helper_blackbox_test.go @@ -26,7 +26,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" uapi "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -60,23 +59,23 @@ func TestNegotiateVersion(t *testing.T) { }{ { name: "server supports client default", - serverVersions: []string{"version1", registered.GroupOrDie(api.GroupName).GroupVersion.String()}, - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + serverVersions: []string{"version1", api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, expectedVersion: &schema.GroupVersion{Version: "version1"}, statusCode: http.StatusOK, }, { name: "server falls back to client supported", serverVersions: []string{"version1"}, - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, expectedVersion: &schema.GroupVersion{Version: "version1"}, statusCode: http.StatusOK, }, { name: "explicit version supported", requiredVersion: &schema.GroupVersion{Version: "v1"}, - serverVersions: []string{"/version1", registered.GroupOrDie(api.GroupName).GroupVersion.String()}, - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + serverVersions: []string{"/version1", api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, expectedVersion: &schema.GroupVersion{Version: "v1"}, statusCode: http.StatusOK, }, @@ -84,7 +83,7 @@ func TestNegotiateVersion(t *testing.T) { name: "explicit version not supported on server", requiredVersion: &schema.GroupVersion{Version: "v1"}, serverVersions: []string{"version1"}, - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, expectErr: func(err error) bool { return strings.Contains(err.Error(), `server does not support API version "v1"`) }, statusCode: http.StatusOK, }, @@ -99,21 +98,21 @@ func TestNegotiateVersion(t *testing.T) { { name: "connection refused error", serverVersions: []string{"version1"}, - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, sendErr: errors.New("connection refused"), expectErr: func(err error) bool { return strings.Contains(err.Error(), "connection refused") }, statusCode: http.StatusOK, }, { name: "discovery fails due to 403 Forbidden errors and thus serverVersions is empty, use default GroupVersion", - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, expectedVersion: &schema.GroupVersion{Version: "version1"}, statusCode: http.StatusForbidden, }, { name: "discovery fails due to 404 Not Found errors and thus serverVersions is empty, use requested GroupVersion", requiredVersion: &schema.GroupVersion{Version: "version1"}, - clientVersions: []schema.GroupVersion{{Version: "version1"}, registered.GroupOrDie(api.GroupName).GroupVersion}, + clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, expectedVersion: &schema.GroupVersion{Version: "version1"}, statusCode: http.StatusNotFound, }, diff --git a/pkg/client/typed/discovery/restmapper_test.go b/pkg/client/typed/discovery/restmapper_test.go index 4ef321f2d3..73a087f5dd 100644 --- a/pkg/client/typed/discovery/restmapper_test.go +++ b/pkg/client/typed/discovery/restmapper_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -188,7 +188,7 @@ func TestDeferredDiscoveryRESTMapper_CacheMiss(t *testing.T) { assert := assert.New(t) cdc := fakeCachedDiscoveryInterface{fresh: false} - m := NewDeferredDiscoveryRESTMapper(&cdc, registered.InterfacesFor) + m := NewDeferredDiscoveryRESTMapper(&cdc, api.Registry.InterfacesFor) assert.False(cdc.fresh, "should NOT be fresh after instantiation") assert.Zero(cdc.invalidateCalls, "should not have called Invalidate()") diff --git a/pkg/client/typed/discovery/unstructured.go b/pkg/client/typed/discovery/unstructured.go index bae5469ae5..ee72d668bc 100644 --- a/pkg/client/typed/discovery/unstructured.go +++ b/pkg/client/typed/discovery/unstructured.go @@ -82,7 +82,7 @@ func (d *UnstructuredObjectTyper) Recognizes(gvk schema.GroupVersionKind) bool { // IsUnversioned returns false always because runtime.Unstructured objects // should always have group,version,kind information set. ok will be true if the -// object's group,version,kind is registered. +// object's group,version,kind is api.Registry. func (d *UnstructuredObjectTyper) IsUnversioned(obj runtime.Object) (unversioned bool, ok bool) { gvk, err := d.ObjectKind(obj) if err != nil { diff --git a/pkg/client/unversioned/BUILD b/pkg/client/unversioned/BUILD index 8d62547dc1..755f063b5d 100644 --- a/pkg/client/unversioned/BUILD +++ b/pkg/client/unversioned/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//plugin/pkg/client/auth: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/util/wait", @@ -44,7 +43,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi: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", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/client/unversioned/helper.go b/pkg/client/unversioned/helper.go index abc21bde26..7ab52346c9 100644 --- a/pkg/client/unversioned/helper.go +++ b/pkg/client/unversioned/helper.go @@ -17,7 +17,6 @@ limitations under the License. package unversioned import ( - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" // Import solely to initialize client auth plugins. @@ -37,7 +36,7 @@ func SetKubernetesDefaults(config *restclient.Config) error { config.APIPath = legacyAPIPath } if config.GroupVersion == nil || config.GroupVersion.Group != api.GroupName { - g, err := registered.Group(api.GroupName) + g, err := api.Registry.Group(api.GroupName) if err != nil { return err } @@ -56,7 +55,7 @@ func setGroupDefaults(groupName string, config *restclient.Config) error { config.UserAgent = restclient.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != groupName { - g, err := registered.Group(groupName) + g, err := api.Registry.Group(groupName) if err != nil { return err } diff --git a/pkg/client/unversioned/helper_test.go b/pkg/client/unversioned/helper_test.go index b35a30efb3..4428b3376c 100644 --- a/pkg/client/unversioned/helper_test.go +++ b/pkg/client/unversioned/helper_test.go @@ -23,7 +23,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" @@ -43,7 +42,7 @@ func TestSetKubernetesDefaults(t *testing.T) { restclient.Config{ APIPath: "/api", ContentConfig: restclient.ContentConfig{ - GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), }, }, @@ -141,9 +140,9 @@ func TestSetsCodec(t *testing.T) { Prefix string NegotiatedSerializer runtime.NegotiatedSerializer }{ - registered.GroupOrDie(api.GroupName).GroupVersion.Version: { + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version: { Err: false, - Prefix: "/api/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version, + Prefix: "/api/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), }, // Add this test back when we fixed config and SetKubernetesDefaults diff --git a/pkg/client/unversioned/testclient/simple/BUILD b/pkg/client/unversioned/testclient/simple/BUILD index b9f9c6c50d..3a96ec1e0a 100644 --- a/pkg/client/unversioned/testclient/simple/BUILD +++ b/pkg/client/unversioned/testclient/simple/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/client/restclient:go_default_library", "//pkg/fields:go_default_library", "//pkg/util/testing:go_default_library", - "//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", diff --git a/pkg/client/unversioned/testclient/simple/simple_testclient.go b/pkg/client/unversioned/testclient/simple/simple_testclient.go index edf0da1e3d..73ba6066c4 100644 --- a/pkg/client/unversioned/testclient/simple/simple_testclient.go +++ b/pkg/client/unversioned/testclient/simple/simple_testclient.go @@ -24,7 +24,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -141,9 +140,9 @@ func (c *Client) ValidateCommon(t *testing.T, err error) { validator, ok := c.QueryValidator[key] if !ok { switch key { - case metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()): + case metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()): validator = ValidateLabels - case metav1.FieldSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()): + case metav1.FieldSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()): validator = validateFields default: validator = func(a, b string) bool { return a == b } diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 6d27906c4e..28b8269d7b 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -63,7 +63,6 @@ go_test( "//pkg/util/clock:go_default_library", "//pkg/util/testing:go_default_library", "//pkg/util/uuid: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/util/sets", diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index dc2b940650..66a4d7d394 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -27,7 +27,6 @@ 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/util/sets" @@ -56,7 +55,7 @@ func NewFakeControllerExpectationsLookup(ttl time.Duration) (*ControllerExpectat func newReplicationController(replicas int) *v1.ReplicationController { rc := &v1.ReplicationController{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -247,7 +246,7 @@ func TestCreatePods(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) podControl := RealPodControl{ KubeClient: clientset, diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index aa62900eff..0b028bb34e 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -45,6 +45,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", @@ -55,7 +56,6 @@ go_test( "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/securitycontext:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index 7d4f190683..8810a14691 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" @@ -83,7 +83,7 @@ func newDaemonSet(name string) *extensions.DaemonSet { func newNode(name string, label map[string]string) *v1.Node { return &v1.Node{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ Name: name, Labels: label, @@ -108,7 +108,7 @@ func addNodes(nodeStore cache.Store, startIndex, numNodes int, label map[string] func newPod(podName string, nodeName string, label map[string]string) *v1.Pod { pod := &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ GenerateName: podName, Labels: label, diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 59a85342d1..0d09cee3d7 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -67,7 +67,6 @@ go_test( "//pkg/controller/informers:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/uuid: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", diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 12f9312022..069ad7499c 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -20,10 +20,10 @@ import ( "fmt" "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" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" @@ -65,7 +65,7 @@ func newRSWithStatus(name string, specReplicas, statusReplicas int, selector map func newDeployment(name string, replicas int, revisionHistoryLimit *int32, maxSurge, maxUnavailable *intstr.IntOrString, selector map[string]string) *extensions.Deployment { d := extensions.Deployment{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(extensions.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(extensions.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: name, diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index 7e81e8208c..3cb64eaa35 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -53,7 +53,6 @@ go_test( "//pkg/util/intstr:go_default_library", "//pkg/util/uuid:go_default_library", "//pkg/util/workqueue:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", ], ) diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 0d1a3cd307..207ff2d816 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_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/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" @@ -118,7 +117,7 @@ func newSelFooBar() *metav1.LabelSelector { func newPodDisruptionBudget(t *testing.T, minAvailable intstr.IntOrString) (*policy.PodDisruptionBudget, string) { pdb := &policy.PodDisruptionBudget{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -141,7 +140,7 @@ func newPodDisruptionBudget(t *testing.T, minAvailable intstr.IntOrString) (*pol func newPod(t *testing.T, name string) (*v1.Pod, string) { pod := &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Annotations: make(map[string]string), @@ -168,7 +167,7 @@ func newPod(t *testing.T, name string) (*v1.Pod, string) { func newReplicationController(t *testing.T, size int32) (*v1.ReplicationController, string) { rc := &v1.ReplicationController{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -192,7 +191,7 @@ func newReplicationController(t *testing.T, size int32) (*v1.ReplicationControll func newDeployment(t *testing.T, size int32) (*extensions.Deployment, string) { d := &extensions.Deployment{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -216,7 +215,7 @@ func newDeployment(t *testing.T, size int32) (*extensions.Deployment, string) { func newReplicaSet(t *testing.T, size int32) (*extensions.ReplicaSet, string) { rs := &extensions.ReplicaSet{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -240,7 +239,7 @@ func newReplicaSet(t *testing.T, size int32) (*extensions.ReplicaSet, string) { func newStatefulSet(t *testing.T, size int32) (*apps.StatefulSet, string) { ss := &apps.StatefulSet{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index e25c6ab82c..2354448a58 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -43,6 +43,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/endpoints:go_default_library", @@ -52,7 +53,6 @@ go_test( "//pkg/controller:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index ec60f5b67c..2318daaa57 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -22,10 +22,9 @@ import ( "net/http/httptest" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" - _ "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" @@ -43,7 +42,7 @@ var emptyNodeName string func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotReady int) { for i := 0; i < nPods+nNotReady; i++ { p := &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ Namespace: namespace, Name: fmt.Sprintf("pod%d", i), @@ -108,7 +107,7 @@ func TestSyncEndpointsItemsPreserveNoSelector(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady endpoints.serviceStore.Indexer.Add(&v1.Service{ @@ -141,7 +140,7 @@ func TestCheckLeftoverEndpoints(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady endpoints.checkLeftoverEndpoints() @@ -170,7 +169,7 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady @@ -213,7 +212,7 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 1, 1, 0) @@ -252,7 +251,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) { Subsets: []v1.EndpointSubset{}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 1, 1, 0) @@ -290,7 +289,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllNotReady(t *testing.T) { Subsets: []v1.EndpointSubset{}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 0, 1, 1) @@ -328,7 +327,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllMixed(t *testing.T) { Subsets: []v1.EndpointSubset{}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 1, 1, 1) @@ -370,7 +369,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 1, 1, 0) @@ -411,7 +410,7 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, v1.NamespaceDefault, 1, 1, 0) @@ -431,7 +430,7 @@ func TestSyncEndpointsItems(t *testing.T) { testServer, endpointsHandler := makeTestServer(t, ns, serverResponse{http.StatusOK, &v1.Endpoints{}}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 3, 2, 0) @@ -474,7 +473,7 @@ func TestSyncEndpointsItemsWithLabels(t *testing.T) { testServer, endpointsHandler := makeTestServer(t, ns, serverResponse{http.StatusOK, &v1.Endpoints{}}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 3, 2, 0) @@ -535,7 +534,7 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) { }}, }}) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) endpoints := NewEndpointControllerFromClient(client, controller.NoResyncPeriodFunc) endpoints.podStoreSynced = alwaysReady addPods(endpoints.podStore.Indexer, ns, 1, 1, 0) diff --git a/pkg/controller/garbagecollector/BUILD b/pkg/controller/garbagecollector/BUILD index 5cb7c9665a..2509348730 100644 --- a/pkg/controller/garbagecollector/BUILD +++ b/pkg/controller/garbagecollector/BUILD @@ -50,6 +50,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/install:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/restclient:go_default_library", @@ -58,7 +59,6 @@ go_test( "//pkg/util/clock:go_default_library", "//pkg/util/workqueue:go_default_library", "//vendor:github.com/stretchr/testify/assert", - "//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", diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index fde08aaa22..20f197deec 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -27,13 +27,13 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" - "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" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" @@ -45,11 +45,11 @@ import ( func TestNewGarbageCollector(t *testing.T) { config := &restclient.Config{} config.ContentConfig.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: metaonly.NewMetadataCodecFactory()} - metaOnlyClientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + metaOnlyClientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) config.ContentConfig.NegotiatedSerializer = nil - clientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + clientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) podResource := map[schema.GroupVersionResource]struct{}{schema.GroupVersionResource{Version: "v1", Resource: "pods"}: {}} - gc, err := NewGarbageCollector(metaOnlyClientPool, clientPool, registered.RESTMapper(), podResource) + gc, err := NewGarbageCollector(metaOnlyClientPool, clientPool, api.Registry.RESTMapper(), podResource) if err != nil { t.Fatal(err) } @@ -109,11 +109,11 @@ func testServerAndClientConfig(handler func(http.ResponseWriter, *http.Request)) func setupGC(t *testing.T, config *restclient.Config) *GarbageCollector { config.ContentConfig.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: metaonly.NewMetadataCodecFactory()} - metaOnlyClientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + metaOnlyClientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) config.ContentConfig.NegotiatedSerializer = nil - clientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + clientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) podResource := map[schema.GroupVersionResource]struct{}{schema.GroupVersionResource{Version: "v1", Resource: "pods"}: {}} - gc, err := NewGarbageCollector(metaOnlyClientPool, clientPool, registered.RESTMapper(), podResource) + gc, err := NewGarbageCollector(metaOnlyClientPool, clientPool, api.Registry.RESTMapper(), podResource) if err != nil { t.Fatal(err) } @@ -342,7 +342,7 @@ func TestGCListWatcher(t *testing.T) { testHandler := &fakeActionHandler{} srv, clientConfig := testServerAndClientConfig(testHandler.ServeHTTP) defer srv.Close() - clientPool := dynamic.NewClientPool(clientConfig, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + clientPool := dynamic.NewClientPool(clientConfig, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) podResource := schema.GroupVersionResource{Version: "v1", Resource: "pods"} client, err := clientPool.ClientForGroupVersionResource(podResource) if err != nil { diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index 8abea7b265..aed8059f6a 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -56,7 +56,6 @@ go_test( "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", "//pkg/util/rand:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index 82ce78c123..95507dbf6a 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -21,7 +21,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" @@ -228,7 +227,7 @@ func TestControllerSyncJob(t *testing.T) { for name, tc := range testCases { // job manager setup - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{Err: tc.podControllerError} manager.podControl = &fakePodControl @@ -332,7 +331,7 @@ func TestSyncJobPastDeadline(t *testing.T) { for name, tc := range testCases { // job manager setup - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{} manager.podControl = &fakePodControl @@ -404,7 +403,7 @@ func getCondition(job *batch.Job, condition batch.JobConditionType) bool { } func TestSyncPastDeadlineJobFinished(t *testing.T) { - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{} manager.podControl = &fakePodControl @@ -439,7 +438,7 @@ func TestSyncPastDeadlineJobFinished(t *testing.T) { } func TestSyncJobComplete(t *testing.T) { - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{} manager.podControl = &fakePodControl @@ -464,7 +463,7 @@ func TestSyncJobComplete(t *testing.T) { } func TestSyncJobDeleted(t *testing.T) { - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, _ := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{} manager.podControl = &fakePodControl @@ -485,7 +484,7 @@ func TestSyncJobDeleted(t *testing.T) { } func TestSyncJobUpdateRequeue(t *testing.T) { - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{} manager.podControl = &fakePodControl @@ -511,7 +510,7 @@ func TestSyncJobUpdateRequeue(t *testing.T) { } func TestJobPodLookup(t *testing.T) { - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) manager.podStoreSynced = alwaysReady manager.jobStoreSynced = alwaysReady @@ -602,7 +601,7 @@ func (fe FakeJobExpectations) SatisfiedExpectations(controllerKey string) bool { // TestSyncJobExpectations tests that a pod cannot sneak in between counting active pods // and checking expectations. func TestSyncJobExpectations(t *testing.T) { - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager, sharedInformerFactory := newJobControllerFromClient(clientset, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{} manager.podControl = &fakePodControl diff --git a/pkg/controller/namespace/BUILD b/pkg/controller/namespace/BUILD index f44c7f33e0..1a1e286134 100644 --- a/pkg/controller/namespace/BUILD +++ b/pkg/controller/namespace/BUILD @@ -53,7 +53,6 @@ go_test( "//pkg/client/testing/core:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic: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", diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 744b0d65e7..002ba61157 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -25,7 +25,6 @@ import ( "sync" "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" @@ -170,7 +169,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *metav1.APIVersio defer srv.Close() mockClient := fake.NewSimpleClientset(testInput.testNamespace) - clientPool := dynamic.NewClientPool(clientConfig, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + clientPool := dynamic.NewClientPool(clientConfig, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) fn := func() ([]*metav1.APIResourceList, error) { return resources, nil diff --git a/pkg/controller/petset/BUILD b/pkg/controller/petset/BUILD index 6e94dd8537..a6eb06ad7a 100644 --- a/pkg/controller/petset/BUILD +++ b/pkg/controller/petset/BUILD @@ -56,6 +56,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", @@ -69,7 +70,6 @@ go_test( "//pkg/client/testing/core:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/controller/petset/pet_test.go b/pkg/controller/petset/pet_test.go index 4d8babab3f..f9e6c405a9 100644 --- a/pkg/controller/petset/pet_test.go +++ b/pkg/controller/petset/pet_test.go @@ -21,8 +21,8 @@ import ( "net/http/httptest" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -95,7 +95,7 @@ func TestUpdatePetWithoutRetry(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) petClient := newPetClient(client) err := petClient.Update(tc.realPet, tc.expectedPet) @@ -115,7 +115,7 @@ func TestUpdatePetWithFailure(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) petClient := newPetClient(client) pcb1, pcb2 := makeTwoDifferntPCB() diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index ace0784716..b6034cb19c 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -59,7 +59,6 @@ go_test( "//pkg/controller/podautoscaler/metrics:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", - "//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/watch", diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 0ccf9e6755..b8b6fdc731 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -27,7 +27,6 @@ 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" diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 4379c2a257..44c93eee9d 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -39,7 +39,6 @@ go_test( "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/heapster/metrics/api/v1/types", diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go index e0d498ce43..ab15981e76 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go @@ -23,7 +23,6 @@ import ( "testing" "time" - _ "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api/resource" diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 74b97e92bc..48aa2441d1 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -25,7 +25,6 @@ import ( "testing" "time" - _ "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api/resource" diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 9a5720b754..e953e537f4 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -60,7 +60,6 @@ go_test( "//pkg/securitycontext:go_default_library", "//pkg/util/testing:go_default_library", "//pkg/util/uuid: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/util/sets", diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 9bc4c4c501..2f88084980 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -28,7 +28,6 @@ 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/util/sets" @@ -99,7 +98,7 @@ func getKey(rs *extensions.ReplicaSet, t *testing.T) string { func newReplicaSet(replicas int, selectorMap map[string]string) *extensions.ReplicaSet { rs := &extensions.ReplicaSet{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -198,7 +197,7 @@ type serverResponse struct { } func TestSyncReplicaSetDoesNothing(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} stopCh := make(chan struct{}) defer close(stopCh) @@ -217,7 +216,7 @@ func TestSyncReplicaSetDoesNothing(t *testing.T) { } func TestSyncReplicaSetDeletes(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} stopCh := make(chan struct{}) defer close(stopCh) @@ -236,7 +235,7 @@ func TestSyncReplicaSetDeletes(t *testing.T) { } func TestDeleteFinalStateUnknown(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} stopCh := make(chan struct{}) defer close(stopCh) @@ -272,7 +271,7 @@ func TestDeleteFinalStateUnknown(t *testing.T) { } func TestSyncReplicaSetCreates(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) stopCh := make(chan struct{}) defer close(stopCh) manager := testNewReplicaSetControllerFromClient(client, stopCh, BurstReplicas, 0) @@ -298,7 +297,7 @@ func TestStatusUpdatesWithoutReplicasChange(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) stopCh := make(chan struct{}) defer close(stopCh) manager := testNewReplicaSetControllerFromClient(client, stopCh, BurstReplicas, 0) @@ -344,7 +343,7 @@ func TestControllerUpdateReplicas(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) stopCh := make(chan struct{}) defer close(stopCh) manager := testNewReplicaSetControllerFromClient(client, stopCh, BurstReplicas, 0) @@ -392,7 +391,7 @@ func TestSyncReplicaSetDormancy(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} stopCh := make(chan struct{}) @@ -454,7 +453,7 @@ func TestSyncReplicaSetDormancy(t *testing.T) { func TestPodControllerLookup(t *testing.T) { stopCh := make(chan struct{}) defer close(stopCh) - manager := testNewReplicaSetControllerFromClient(clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}), stopCh, BurstReplicas, 0) + manager := testNewReplicaSetControllerFromClient(clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}), stopCh, BurstReplicas, 0) manager.podListerSynced = alwaysReady testCases := []struct { inRSs []*extensions.ReplicaSet @@ -688,7 +687,7 @@ func TestControllerUpdateRequeue(t *testing.T) { stopCh := make(chan struct{}) defer close(stopCh) - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := testNewReplicaSetControllerFromClient(client, stopCh, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -757,7 +756,7 @@ func TestControllerUpdateStatusWithFailure(t *testing.T) { // TODO: This test is too hairy for a unittest. It should be moved to an E2E suite. func doTestControllerBurstReplicas(t *testing.T, burstReplicas, numReplicas int) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} stopCh := make(chan struct{}) defer close(stopCh) @@ -911,7 +910,7 @@ func (fe FakeRSExpectations) SatisfiedExpectations(controllerKey string) bool { // TestRSSyncExpectations tests that a pod cannot sneak in between counting active pods // and checking expectations. func TestRSSyncExpectations(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} stopCh := make(chan struct{}) defer close(stopCh) @@ -939,7 +938,7 @@ func TestRSSyncExpectations(t *testing.T) { } func TestDeleteControllerAndExpectations(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) stopCh := make(chan struct{}) defer close(stopCh) manager := testNewReplicaSetControllerFromClient(client, stopCh, 10, 0) @@ -994,7 +993,7 @@ func shuffle(controllers []*extensions.ReplicaSet) []*extensions.ReplicaSet { } func TestOverlappingRSs(t *testing.T) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) labelMap := map[string]string{"foo": "bar"} for i := 0; i < 5; i++ { @@ -1030,7 +1029,7 @@ func TestOverlappingRSs(t *testing.T) { } func TestDeletionTimestamp(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) labelMap := map[string]string{"foo": "bar"} stopCh := make(chan struct{}) defer close(stopCh) @@ -1350,7 +1349,7 @@ func TestReadyReplicas(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) stopCh := make(chan struct{}) defer close(stopCh) manager := testNewReplicaSetControllerFromClient(client, stopCh, BurstReplicas, 0) @@ -1393,7 +1392,7 @@ func TestAvailableReplicas(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) stopCh := make(chan struct{}) defer close(stopCh) manager := testNewReplicaSetControllerFromClient(client, stopCh, BurstReplicas, 0) diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index 65039b8a95..612768b2ef 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -57,7 +57,6 @@ go_test( "//pkg/securitycontext:go_default_library", "//pkg/util/testing:go_default_library", "//pkg/util/uuid: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/util/sets", diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 8e5e9302ca..1cde941c7e 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -27,7 +27,6 @@ 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/util/sets" @@ -62,7 +61,7 @@ func getKey(rc *v1.ReplicationController, t *testing.T) string { func newReplicationController(replicas int) *v1.ReplicationController { rc := &v1.ReplicationController{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -160,7 +159,7 @@ type serverResponse struct { } func TestSyncReplicationControllerDoesNothing(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -176,7 +175,7 @@ func TestSyncReplicationControllerDoesNothing(t *testing.T) { } func TestSyncReplicationControllerDeletes(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -192,7 +191,7 @@ func TestSyncReplicationControllerDeletes(t *testing.T) { } func TestDeleteFinalStateUnknown(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -225,7 +224,7 @@ func TestDeleteFinalStateUnknown(t *testing.T) { } func TestSyncReplicationControllerCreates(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -247,7 +246,7 @@ func TestStatusUpdatesWithoutReplicasChange(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -288,7 +287,7 @@ func TestControllerUpdateReplicas(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -333,7 +332,7 @@ func TestSyncReplicationControllerDormancy(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -388,7 +387,7 @@ func TestSyncReplicationControllerDormancy(t *testing.T) { } func TestPodControllerLookup(t *testing.T) { - manager := NewReplicationManagerFromClient(clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}), controller.NoResyncPeriodFunc, BurstReplicas, 0) + manager := NewReplicationManagerFromClient(clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}), controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady testCases := []struct { inRCs []*v1.ReplicationController @@ -616,7 +615,7 @@ func TestControllerUpdateRequeue(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -686,7 +685,7 @@ func TestControllerUpdateStatusWithFailure(t *testing.T) { // TODO: This test is too hairy for a unittest. It should be moved to an E2E suite. func doTestControllerBurstReplicas(t *testing.T, burstReplicas, numReplicas int) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, burstReplicas, 0) manager.podListerSynced = alwaysReady @@ -836,7 +835,7 @@ func (fe FakeRCExpectations) SatisfiedExpectations(controllerKey string) bool { // TestRCSyncExpectations tests that a pod cannot sneak in between counting active pods // and checking expectations. func TestRCSyncExpectations(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) fakePodControl := controller.FakePodControl{} manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, 2, 0) manager.podListerSynced = alwaysReady @@ -861,7 +860,7 @@ func TestRCSyncExpectations(t *testing.T) { } func TestDeleteControllerAndExpectations(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, 10, 0) manager.podListerSynced = alwaysReady @@ -914,7 +913,7 @@ func shuffle(controllers []*v1.ReplicationController) []*v1.ReplicationControlle } func TestOverlappingRCs(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) for i := 0; i < 5; i++ { manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, 10, 0) @@ -945,7 +944,7 @@ func TestOverlappingRCs(t *testing.T) { } func TestDeletionTimestamp(t *testing.T) { - c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, 10, 0) manager.podListerSynced = alwaysReady @@ -1035,7 +1034,7 @@ func TestDeletionTimestamp(t *testing.T) { } func BenchmarkGetPodControllerMultiNS(b *testing.B) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(client, controller.NoResyncPeriodFunc, BurstReplicas, 0) const nsNum = 1000 @@ -1081,7 +1080,7 @@ func BenchmarkGetPodControllerMultiNS(b *testing.B) { } func BenchmarkGetPodControllerSingleNS(b *testing.B) { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(client, controller.NoResyncPeriodFunc, BurstReplicas, 0) const rcNum = 1000 @@ -1321,7 +1320,7 @@ func TestReadyReplicas(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady @@ -1360,7 +1359,7 @@ func TestAvailableReplicas(t *testing.T) { testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) manager := NewReplicationManagerFromClient(c, controller.NoResyncPeriodFunc, BurstReplicas, 0) manager.podListerSynced = alwaysReady diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index 97b536f66a..d3cf2a4539 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -54,7 +54,6 @@ go_library( "//vendor:github.com/pkg/errors", "//vendor:gopkg.in/natefinch/lumberjack.v2", "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/genericapiserver/openapi/common", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -106,7 +105,6 @@ go_test( "//vendor:github.com/stretchr/testify/assert", "//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/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/genericapiserver/default_storage_factory_builder.go b/pkg/genericapiserver/default_storage_factory_builder.go index 35c84b4df8..ccb2e4ab8c 100644 --- a/pkg/genericapiserver/default_storage_factory_builder.go +++ b/pkg/genericapiserver/default_storage_factory_builder.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/util/config" ) @@ -73,9 +73,9 @@ func mergeAPIResourceConfigs(defaultAPIResourceConfig *ResourceConfig, resourceC if ok { if allAPIFlagValue == "false" { // Disable all group versions. - resourceConfig.DisableVersions(registered.RegisteredGroupVersions()...) + resourceConfig.DisableVersions(api.Registry.RegisteredGroupVersions()...) } else if allAPIFlagValue == "true" { - resourceConfig.EnableVersions(registered.RegisteredGroupVersions()...) + resourceConfig.EnableVersions(api.Registry.RegisteredGroupVersions()...) } } @@ -109,8 +109,8 @@ func mergeAPIResourceConfigs(defaultAPIResourceConfig *ResourceConfig, resourceC if err != nil { return nil, fmt.Errorf("invalid key %s", key) } - // Verify that the groupVersion is registered. - if !registered.IsRegisteredVersion(groupVersion) { + // Verify that the groupVersion is api.Registry. + if !api.Registry.IsRegisteredVersion(groupVersion) { return nil, fmt.Errorf("group version %s that has not been registered", groupVersion.String()) } enabled, err := getRuntimeConfigValue(overrides, key, false) @@ -141,8 +141,8 @@ func mergeAPIResourceConfigs(defaultAPIResourceConfig *ResourceConfig, resourceC return nil, fmt.Errorf("invalid key %s", key) } resource := tokens[2] - // Verify that the groupVersion is registered. - if !registered.IsRegisteredVersion(groupVersion) { + // Verify that the groupVersion is api.Registry. + if !api.Registry.IsRegisteredVersion(groupVersion) { return nil, fmt.Errorf("group version %s that has not been registered", groupVersion.String()) } diff --git a/pkg/genericapiserver/default_storage_factory_builder_test.go b/pkg/genericapiserver/default_storage_factory_builder_test.go index c3157e7ae2..3a376b97cc 100644 --- a/pkg/genericapiserver/default_storage_factory_builder_test.go +++ b/pkg/genericapiserver/default_storage_factory_builder_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) @@ -170,7 +170,7 @@ func TestParseRuntimeConfig(t *testing.T) { }, expectedAPIConfig: func() *ResourceConfig { config := NewResourceConfig() - config.EnableVersions(registered.RegisteredGroupVersions()...) + config.EnableVersions(api.Registry.RegisteredGroupVersions()...) return config }, err: false, @@ -185,7 +185,7 @@ func TestParseRuntimeConfig(t *testing.T) { }, expectedAPIConfig: func() *ResourceConfig { config := NewResourceConfig() - config.DisableVersions(registered.RegisteredGroupVersions()...) + config.DisableVersions(api.Registry.RegisteredGroupVersions()...) return config }, err: false, diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 617a94f4f7..fe0a7123c8 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -31,7 +31,6 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/apimachinery" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" openapicommon "k8s.io/apimachinery/pkg/genericapiserver/openapi/common" "k8s.io/apimachinery/pkg/runtime" @@ -373,12 +372,12 @@ func (s *GenericAPIServer) DynamicApisDiscovery() *restful.WebService { // NewDefaultAPIGroupInfo returns an APIGroupInfo stubbed with "normal" values // exposed for easier composition from other packages func NewDefaultAPIGroupInfo(group string) APIGroupInfo { - groupMeta := registered.GroupOrDie(group) + groupMeta := api.Registry.GroupOrDie(group) return APIGroupInfo{ GroupMeta: *groupMeta, VersionedResourcesStorageMap: map[string]map[string]rest.Storage{}, - OptionsExternalVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, + OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, Scheme: api.Scheme, ParameterCodec: api.ParameterCodec, NegotiatedSerializer: api.Codecs, diff --git a/pkg/genericapiserver/options/BUILD b/pkg/genericapiserver/options/BUILD index fd1836fd45..bf77fff409 100644 --- a/pkg/genericapiserver/options/BUILD +++ b/pkg/genericapiserver/options/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/util/config:go_default_library", "//vendor:github.com/golang/glog", "//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/net", "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1", diff --git a/pkg/genericapiserver/options/server_run_options.go b/pkg/genericapiserver/options/server_run_options.go index 845b65c304..4fb7cfa50d 100644 --- a/pkg/genericapiserver/options/server_run_options.go +++ b/pkg/genericapiserver/options/server_run_options.go @@ -21,7 +21,6 @@ import ( "net" "strings" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" @@ -66,7 +65,7 @@ func NewServerRunOptions() *ServerRunOptions { return &ServerRunOptions{ AdmissionControl: "AlwaysAdmit", DefaultStorageMediaType: "application/json", - DefaultStorageVersions: registered.AllPreferredGroupVersions(), + DefaultStorageVersions: api.Registry.AllPreferredGroupVersions(), DeleteCollectionWorkers: 1, EnableGarbageCollection: true, EnableProfiling: true, @@ -76,7 +75,7 @@ func NewServerRunOptions() *ServerRunOptions { MaxMutatingRequestsInFlight: 200, MinRequestTimeout: 1800, RuntimeConfig: make(config.ConfigurationMap), - StorageVersions: registered.AllPreferredGroupVersions(), + StorageVersions: api.Registry.AllPreferredGroupVersions(), } } diff --git a/pkg/genericapiserver/resource_encoding_config.go b/pkg/genericapiserver/resource_encoding_config.go index 97e0833903..26c9d84619 100644 --- a/pkg/genericapiserver/resource_encoding_config.go +++ b/pkg/genericapiserver/resource_encoding_config.go @@ -17,9 +17,9 @@ limitations under the License. package genericapiserver import ( - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/kubernetes/pkg/api" ) type ResourceEncodingConfig interface { @@ -79,7 +79,7 @@ func (o *DefaultResourceEncodingConfig) SetResourceEncoding(resourceBeingStored } func (o *DefaultResourceEncodingConfig) StorageEncodingFor(resource schema.GroupResource) (schema.GroupVersion, error) { - groupMeta, err := registered.Group(resource.Group) + groupMeta, err := api.Registry.Group(resource.Group) if err != nil { return schema.GroupVersion{}, err } @@ -100,7 +100,7 @@ func (o *DefaultResourceEncodingConfig) StorageEncodingFor(resource schema.Group } func (o *DefaultResourceEncodingConfig) InMemoryEncodingFor(resource schema.GroupResource) (schema.GroupVersion, error) { - if _, err := registered.Group(resource.Group); err != nil { + if _, err := api.Registry.Group(resource.Group); err != nil { return schema.GroupVersion{}, err } diff --git a/pkg/genericapiserver/routes/index.go b/pkg/genericapiserver/routes/index.go index 25945296b3..7ddef65900 100644 --- a/pkg/genericapiserver/routes/index.go +++ b/pkg/genericapiserver/routes/index.go @@ -33,7 +33,7 @@ func (i Index) Install(c *mux.APIContainer) { c.UnlistedRoutes.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { status := http.StatusOK if r.URL.Path != "/" && r.URL.Path != "/index.html" { - // Since "/" matches all paths, handleIndex is called for all paths for which there is no handler registered. + // Since "/" matches all paths, handleIndex is called for all paths for which there is no handler api.Registry. // We want to return a 404 status with a list of all valid paths, incase of an invalid URL request. status = http.StatusNotFound } diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index f985bc35cb..d31a429d2c 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -177,7 +177,6 @@ go_test( "//pkg/util/testing:go_default_library", "//vendor:github.com/ghodss/yaml", "//vendor:github.com/spf13/cobra", - "//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", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 81d9aa08be..0d00ccdebb 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -111,7 +111,6 @@ go_library( "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", "//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", @@ -197,7 +196,6 @@ go_test( "//vendor:github.com/spf13/cobra", "//vendor:github.com/stretchr/testify/assert", "//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/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/kubectl/cmd/annotate_test.go b/pkg/kubectl/cmd/annotate_test.go index 938e23dc4e..f94b1bb1f9 100644 --- a/pkg/kubectl/cmd/annotate_test.go +++ b/pkg/kubectl/cmd/annotate_test.go @@ -23,7 +23,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" @@ -394,7 +393,7 @@ func TestAnnotateErrors(t *testing.T) { f, tf, _, _ := cmdtesting.NewAPIFactory() tf.Printer = &testPrinter{} tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdAnnotate(f, buf) @@ -453,7 +452,7 @@ func TestAnnotateObject(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdAnnotate(f, buf) @@ -503,7 +502,7 @@ func TestAnnotateObjectFromFile(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdAnnotate(f, buf) @@ -532,7 +531,7 @@ func TestAnnotateLocal(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdAnnotate(f, buf) @@ -585,7 +584,7 @@ func TestAnnotateMultipleObjects(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdAnnotate(f, buf) diff --git a/pkg/kubectl/cmd/apply.go b/pkg/kubectl/cmd/apply.go index 59d159e8cd..255e91217d 100644 --- a/pkg/kubectl/cmd/apply.go +++ b/pkg/kubectl/cmd/apply.go @@ -26,7 +26,6 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -399,7 +398,7 @@ func getRESTMappings(pruneResources *[]pruneResource) (namespaced, nonNamespaced {"apps", "v1beta1", "StatefulSet", true}, } } - registeredMapper := registered.RESTMapper() + registeredMapper := api.Registry.RESTMapper() for _, resource := range *pruneResources { addedMapping, err := registeredMapper.RESTMapping(schema.GroupKind{Group: resource.group, Kind: resource.kind}, resource.version) if err != nil { diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach_test.go index 269fd3cfe2..f34919345e 100644 --- a/pkg/kubectl/cmd/attach_test.go +++ b/pkg/kubectl/cmd/attach_test.go @@ -27,7 +27,6 @@ import ( "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" @@ -127,7 +126,7 @@ func TestPodAndContainerAttach(t *testing.T) { } func TestAttach(t *testing.T) { - version := registered.GroupOrDie(api.GroupName).GroupVersion.Version + version := api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version tests := []struct { name, version, podPath, attachPath, container string pod *api.Pod @@ -226,7 +225,7 @@ func TestAttach(t *testing.T) { } func TestAttachWarnings(t *testing.T) { - version := registered.GroupOrDie(api.GroupName).GroupVersion.Version + version := api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version tests := []struct { name, container, version, podPath, expectedErr, expectedOut string pod *api.Pod diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 54152764bd..1342aac225 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -28,7 +28,6 @@ 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/runtime/schema" @@ -60,7 +59,7 @@ func defaultClientConfig() *restclient.Config { ContentConfig: restclient.ContentConfig{ NegotiatedSerializer: api.Codecs, ContentType: runtime.ContentTypeJSON, - GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, }, } } diff --git a/pkg/kubectl/cmd/convert.go b/pkg/kubectl/cmd/convert.go index 42090d5bd1..0136de026f 100644 --- a/pkg/kubectl/cmd/convert.go +++ b/pkg/kubectl/cmd/convert.go @@ -22,7 +22,6 @@ import ( "os" "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/kubernetes/pkg/api" @@ -102,11 +101,11 @@ type ConvertOptions struct { // Complete collects information required to run Convert command from command line. func (o *ConvertOptions) Complete(f cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string) (err error) { - o.outputVersion, err = cmdutil.OutputVersion(cmd, ®istered.EnabledVersionsForGroup(api.GroupName)[0]) + o.outputVersion, err = cmdutil.OutputVersion(cmd, &api.Registry.EnabledVersionsForGroup(api.GroupName)[0]) if err != nil { return err } - if !registered.IsEnabledVersion(o.outputVersion) { + if !api.Registry.IsEnabledVersion(o.outputVersion) { cmdutil.UsageError(cmd, "'%s' is not a registered version.", o.outputVersion) } diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index 78ae74aa0c..e04ba78fd8 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -24,7 +24,6 @@ import ( "time" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" @@ -498,12 +497,12 @@ func TestDeleteMultipleSelector(t *testing.T) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { switch p, m := req.URL.Path, req.Method; { case p == "/namespaces/test/pods" && m == "GET": - if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, pods)}, nil case p == "/namespaces/test/services" && m == "GET": - if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, svc)}, nil @@ -559,7 +558,7 @@ func TestResourceErrors(t *testing.T) { f, tf, _, _ := cmdtesting.NewAPIFactory() tf.Printer = &testPrinter{} tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf, errBuf := bytes.NewBuffer([]byte{}), bytes.NewBuffer([]byte{}) diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec_test.go index 673d9d3eef..a889b5592c 100644 --- a/pkg/kubectl/cmd/exec_test.go +++ b/pkg/kubectl/cmd/exec_test.go @@ -29,7 +29,6 @@ import ( "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -160,7 +159,7 @@ func TestPodAndContainer(t *testing.T) { } func TestExec(t *testing.T) { - version := registered.GroupOrDie(api.GroupName).GroupVersion.Version + version := api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version tests := []struct { name, podPath, execPath, container string pod *api.Pod diff --git a/pkg/kubectl/cmd/explain.go b/pkg/kubectl/cmd/explain.go index e267970ff3..0e0a1f1720 100644 --- a/pkg/kubectl/cmd/explain.go +++ b/pkg/kubectl/cmd/explain.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" @@ -97,7 +97,7 @@ func RunExplain(f cmdutil.Factory, out, cmdErr io.Writer, cmd *cobra.Command, ar } if len(apiVersionString) == 0 { - groupMeta, err := registered.Group(gvk.Group) + groupMeta, err := api.Registry.Group(gvk.Group) if err != nil { return err } diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 0373f7fb5a..e7d73035b7 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -27,7 +27,6 @@ import ( "testing" "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" @@ -126,7 +125,7 @@ func TestGetUnknownSchemaObject(t *testing.T) { Resp: &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, cmdtesting.NewInternalType("", "", "foo"))}, } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) errBuf := bytes.NewBuffer([]byte{}) @@ -466,7 +465,7 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) errBuf := bytes.NewBuffer([]byte{}) @@ -515,7 +514,7 @@ func TestGetMultipleTypeObjectsWithSelector(t *testing.T) { tf.Client = &fake.RESTClient{ NegotiatedSerializer: unstructuredSerializer, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { @@ -701,7 +700,7 @@ func TestWatchSelector(t *testing.T) { tf.Client = &fake.RESTClient{ NegotiatedSerializer: unstructuredSerializer, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { diff --git a/pkg/kubectl/cmd/label_test.go b/pkg/kubectl/cmd/label_test.go index a0e503f8d4..9da1b3b889 100644 --- a/pkg/kubectl/cmd/label_test.go +++ b/pkg/kubectl/cmd/label_test.go @@ -23,7 +23,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" @@ -315,7 +314,7 @@ func TestLabelErrors(t *testing.T) { f, tf, _, _ := cmdtesting.NewAPIFactory() tf.Printer = &testPrinter{} tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdLabel(f, buf) @@ -375,7 +374,7 @@ func TestLabelForResourceFromFile(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdLabel(f, buf) @@ -406,7 +405,7 @@ func TestLabelLocal(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdLabel(f, buf) @@ -460,7 +459,7 @@ func TestLabelMultipleObjects(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdLabel(f, buf) diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward_test.go index 5bbc886c2d..c0b0527484 100644 --- a/pkg/kubectl/cmd/portforward_test.go +++ b/pkg/kubectl/cmd/portforward_test.go @@ -25,7 +25,6 @@ import ( "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" @@ -44,7 +43,7 @@ func (f *fakePortForwarder) ForwardPorts(method string, url *url.URL, opts PortF } func testPortForward(t *testing.T, flags map[string]string, args []string) { - version := registered.GroupOrDie(api.GroupName).GroupVersion.Version + version := api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version tests := []struct { name string diff --git a/pkg/kubectl/cmd/run_test.go b/pkg/kubectl/cmd/run_test.go index 39f3b383d0..1495797ff8 100644 --- a/pkg/kubectl/cmd/run_test.go +++ b/pkg/kubectl/cmd/run_test.go @@ -27,7 +27,7 @@ import ( "testing" "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/api" @@ -268,7 +268,7 @@ func TestGenerateService(t *testing.T) { for _, test := range tests { sawPOST := false f, tf, codec, ns := cmdtesting.NewAPIFactory() - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} tf.Printer = &testPrinter{} tf.Client = &fake.RESTClient{ NegotiatedSerializer: ns, diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index cd90e4d058..ddb12a9a24 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -58,7 +58,6 @@ go_test( "//pkg/kubectl/resource:go_default_library", "//vendor:github.com/spf13/cobra", "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/kubectl/cmd/set/set_image_test.go b/pkg/kubectl/cmd/set/set_image_test.go index 3f860202d9..8a720c9a95 100644 --- a/pkg/kubectl/cmd/set/set_image_test.go +++ b/pkg/kubectl/cmd/set/set_image_test.go @@ -22,7 +22,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -41,7 +40,7 @@ func TestImageLocal(t *testing.T) { }), } tf.Namespace = "test" - tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} buf := bytes.NewBuffer([]byte{}) cmd := NewCmdImage(f, buf, buf) diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD index 0f22d01dfe..86d1bca40b 100644 --- a/pkg/kubectl/cmd/testing/BUILD +++ b/pkg/kubectl/cmd/testing/BUILD @@ -27,7 +27,6 @@ go_library( "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", "//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/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go index fff37d8486..16aab416c2 100644 --- a/pkg/kubectl/cmd/testing/fake.go +++ b/pkg/kubectl/cmd/testing/fake.go @@ -26,7 +26,6 @@ import ( "github.com/spf13/pflag" "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" @@ -103,7 +102,7 @@ func versionErrIfFalse(b bool) error { return versionErr } -var ValidVersion = registered.GroupOrDie(api.GroupName).GroupVersion.Version +var ValidVersion = api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version var InternalGV = schema.GroupVersion{Group: "apitest", Version: runtime.APIVersionInternal} var UnlikelyGV = schema.GroupVersion{Group: "apitest", Version: "unlikelyversion"} var ValidVersionGV = schema.GroupVersion{Group: "apitest", Version: ValidVersion} diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 80b640753e..1fad3b7ea1 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -55,7 +55,6 @@ go_library( "//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/pflag", "//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", @@ -105,7 +104,6 @@ go_test( "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/stretchr/testify/assert", "//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/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/kubectl/cmd/util/clientcache.go b/pkg/kubectl/cmd/util/clientcache.go index a3668207e8..70d47fd63a 100644 --- a/pkg/kubectl/cmd/util/clientcache.go +++ b/pkg/kubectl/cmd/util/clientcache.go @@ -19,9 +19,9 @@ package util import ( "sync" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" @@ -107,7 +107,7 @@ func (c *ClientCache) ClientConfigForVersion(requiredVersion *schema.GroupVersio } } - negotiatedVersion, err := discovery.NegotiateVersion(discoveryClient, requiredVersion, registered.EnabledVersions()) + negotiatedVersion, err := discovery.NegotiateVersion(discoveryClient, requiredVersion, api.Registry.EnabledVersions()) if err != nil { return nil, err } diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index e660f5aca0..d9f6b80f04 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -34,7 +34,6 @@ import ( "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -501,7 +500,7 @@ func (c *clientSwaggerSchema) ValidateBytes(data []byte) error { if err != nil { return err } - if ok := registered.IsEnabledVersion(gvk.GroupVersion()); !ok { + if ok := api.Registry.IsEnabledVersion(gvk.GroupVersion()); !ok { // if we don't have this in our scheme, just skip validation because its an object we don't recognize return nil } diff --git a/pkg/kubectl/cmd/util/factory_client_access.go b/pkg/kubectl/cmd/util/factory_client_access.go index 2faacb3392..a1b57e644c 100644 --- a/pkg/kubectl/cmd/util/factory_client_access.go +++ b/pkg/kubectl/cmd/util/factory_client_access.go @@ -33,7 +33,6 @@ import ( "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" @@ -214,7 +213,7 @@ func (f *ring0Factory) Decoder(toInternal bool) runtime.Decoder { } func (f *ring0Factory) JSONEncoder() runtime.Encoder { - return api.Codecs.LegacyCodec(registered.EnabledVersions()...) + return api.Codecs.LegacyCodec(api.Registry.EnabledVersions()...) } func (f *ring0Factory) UpdatePodSpecForObject(obj runtime.Object, fn func(*api.PodSpec) error) (bool, error) { diff --git a/pkg/kubectl/cmd/util/factory_object_mapping.go b/pkg/kubectl/cmd/util/factory_object_mapping.go index fa05718830..a8de9abf27 100644 --- a/pkg/kubectl/cmd/util/factory_object_mapping.go +++ b/pkg/kubectl/cmd/util/factory_object_mapping.go @@ -30,7 +30,6 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -64,13 +63,13 @@ func NewObjectMappingFactory(clientAccessFactory ClientAccessFactory) ObjectMapp } func (f *ring1Factory) Object() (meta.RESTMapper, runtime.ObjectTyper) { - mapper := registered.RESTMapper() + mapper := api.Registry.RESTMapper() discoveryClient, err := f.clientAccessFactory.DiscoveryClient() if err == nil { mapper = meta.FirstHitRESTMapper{ MultiRESTMapper: meta.MultiRESTMapper{ - discovery.NewDeferredDiscoveryRESTMapper(discoveryClient, registered.InterfacesFor), - registered.RESTMapper(), // hardcoded fall back + discovery.NewDeferredDiscoveryRESTMapper(discoveryClient, api.Registry.InterfacesFor), + api.Registry.RESTMapper(), // hardcoded fall back }, } } @@ -128,7 +127,7 @@ func (f *ring1Factory) ClientForMapping(mapping *meta.RESTMapping) (resource.RES } gv := gvk.GroupVersion() cfg.GroupVersion = &gv - if registered.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) { + if api.Registry.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) { cfg.NegotiatedSerializer = thirdpartyresourcedata.NewNegotiatedSerializer(api.Codecs, gvk.Kind, gv, gv) } return restclient.RESTClientFor(cfg) diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index 486a6bb0b4..b4e6245c51 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -32,7 +32,6 @@ import ( "time" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -241,7 +240,7 @@ func TestFlagUnderscoreRenaming(t *testing.T) { } func loadSchemaForTest() (validation.Schema, error) { - pathToSwaggerSpec := "../../../../api/swagger-spec/" + registered.GroupOrDie(api.GroupName).GroupVersion.Version + ".json" + pathToSwaggerSpec := "../../../../api/swagger-spec/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version + ".json" data, err := ioutil.ReadFile(pathToSwaggerSpec) if err != nil { return nil, err diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index 5dd5897ef5..210a8be099 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -33,7 +33,6 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/meta" - "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" @@ -694,7 +693,7 @@ func PrintFilterCount(hiddenObjNum int, resource string, options *kubectl.PrintO // and squashes the list's items into a single versioned runtime.Object. func ObjectListToVersionedObject(objects []runtime.Object, version schema.GroupVersion) (runtime.Object, error) { objectList := &api.List{Items: objects} - converted, err := resource.TryConvert(api.Scheme, objectList, version, registered.GroupOrDie(api.GroupName).GroupVersion) + converted, err := resource.TryConvert(api.Scheme, objectList, version, api.Registry.GroupOrDie(api.GroupName).GroupVersion) if err != nil { return nil, err } diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index 501945e183..e531643f8f 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -27,7 +27,6 @@ import ( "testing" "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" @@ -57,7 +56,7 @@ func TestMerge(t *testing.T) { Name: "foo", }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s" }`, registered.GroupOrDie(api.GroupName).GroupVersion.String()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s" }`, api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()), expected: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -86,7 +85,7 @@ func TestMerge(t *testing.T) { }, }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "containers": [ { "name": "c1", "image": "green-image" } ] } }`, registered.GroupOrDie(api.GroupName).GroupVersion.String()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "containers": [ { "name": "c1", "image": "green-image" } ] } }`, api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()), expected: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -112,7 +111,7 @@ func TestMerge(t *testing.T) { Name: "foo", }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "volumes": [ {"name": "v1"}, {"name": "v2"} ] } }`, registered.GroupOrDie(api.GroupName).GroupVersion.String()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "volumes": [ {"name": "v1"}, {"name": "v2"} ] } }`, api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()), expected: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -153,7 +152,7 @@ func TestMerge(t *testing.T) { obj: &api.Service{ Spec: api.ServiceSpec{}, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "ports": [ { "port": 0 } ] } }`, registered.GroupOrDie(api.GroupName).GroupVersion.String()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "ports": [ { "port": 0 } ] } }`, api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()), expected: &api.Service{ Spec: api.ServiceSpec{ SessionAffinity: "None", @@ -176,7 +175,7 @@ func TestMerge(t *testing.T) { }, }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "selector": { "version": "v2" } } }`, registered.GroupOrDie(api.GroupName).GroupVersion.String()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "selector": { "version": "v2" } } }`, api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()), expected: &api.Service{ Spec: api.ServiceSpec{ SessionAffinity: "None", diff --git a/pkg/kubectl/resource/BUILD b/pkg/kubectl/resource/BUILD index 966c653ea6..e3d8b0bab2 100644 --- a/pkg/kubectl/resource/BUILD +++ b/pkg/kubectl/resource/BUILD @@ -30,7 +30,6 @@ go_library( "//vendor:golang.org/x/text/encoding/unicode", "//vendor:golang.org/x/text/transform", "//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/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -69,7 +68,6 @@ go_test( "//vendor:github.com/ghodss/yaml", "//vendor:github.com/stretchr/testify/assert", "//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/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index 7e6bd5d4b2..786637a36a 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -32,7 +32,6 @@ import ( "github.com/ghodss/yaml" "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/serializer/streaming" @@ -191,7 +190,7 @@ func (v *testVisitor) Objects() []runtime.Object { var aPod string = ` { "kind": "Pod", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "busybox{id}", "labels": { @@ -218,7 +217,7 @@ var aPod string = ` var aRC string = ` { "kind": "ReplicationController", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "busybox{id}", "labels": { @@ -712,7 +711,7 @@ func TestResourceByNameAndEmptySelector(t *testing.T) { func TestSelector(t *testing.T) { pods, svc := testData() - labelKey := metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + labelKey := metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), @@ -1007,7 +1006,7 @@ func TestSingleItemImpliedRootScopedObject(t *testing.T) { func TestListObject(t *testing.T) { pods, _ := testData() - labelKey := metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + labelKey := metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), }), testapi.Default.Codec()). @@ -1040,7 +1039,7 @@ func TestListObject(t *testing.T) { func TestListObjectWithDifferentVersions(t *testing.T) { pods, svc := testData() - labelKey := metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + labelKey := metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) obj, err := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index d9a8465563..5141f3cfe9 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -26,7 +26,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -337,7 +336,7 @@ func TestHelperList(t *testing.T) { t.Errorf("url doesn't contain name: %#v", req.URL) return false } - if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { t.Errorf("url doesn't contain query parameters: %#v", req.URL) return false } @@ -355,7 +354,7 @@ func TestHelperList(t *testing.T) { RESTClient: client, NamespaceScoped: true, } - obj, err := modifier.List("bar", registered.GroupOrDie(api.GroupName).GroupVersion.String(), labels.SelectorFromSet(labels.Set{"foo": "baz"}), false) + obj, err := modifier.List("bar", api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), labels.SelectorFromSet(labels.Set{"foo": "baz"}), false) if (err != nil) != test.Err { t.Errorf("unexpected error: %t %v", test.Err, err) } diff --git a/pkg/kubectl/resource/result.go b/pkg/kubectl/resource/result.go index 5ef9380e68..19d71d9fb4 100644 --- a/pkg/kubectl/resource/result.go +++ b/pkg/kubectl/resource/result.go @@ -21,7 +21,6 @@ import ( "reflect" "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" @@ -223,7 +222,7 @@ func AsVersionedObject(infos []*Info, forceList bool, version schema.GroupVersio object = objects[0] } else { object = &api.List{Items: objects} - converted, err := TryConvert(api.Scheme, object, version, registered.GroupOrDie(api.GroupName).GroupVersion) + converted, err := TryConvert(api.Scheme, object, version, api.Registry.GroupOrDie(api.GroupName).GroupVersion) if err != nil { return nil, err } diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index a2779a52f0..42f9d62fdd 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -26,7 +26,6 @@ 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/runtime/schema" @@ -47,7 +46,7 @@ import ( func init() { api.Scheme.AddKnownTypes(testapi.Default.InternalGroupVersion(), &kubectltesting.TestStruct{}) - api.Scheme.AddKnownTypes(registered.GroupOrDie(api.GroupName).GroupVersion, &kubectltesting.TestStruct{}) + api.Scheme.AddKnownTypes(api.Registry.GroupOrDie(api.GroupName).GroupVersion, &kubectltesting.TestStruct{}) } var testData = kubectltesting.TestStruct{ @@ -70,7 +69,7 @@ func TestVersionedPrinter(t *testing.T) { return nil }), api.Scheme, - registered.GroupOrDie(api.GroupName).GroupVersion, + api.Registry.GroupOrDie(api.GroupName).GroupVersion, ) if err := p.PrintObj(original, nil); err != nil { t.Errorf("unexpected error: %v", err) @@ -108,7 +107,7 @@ func TestPrinter(t *testing.T) { }, } emptyListTest := &api.PodList{} - testapi, err := api.Scheme.ConvertToVersion(podTest, registered.GroupOrDie(api.GroupName).GroupVersion) + testapi, err := api.Scheme.ConvertToVersion(podTest, api.Registry.GroupOrDie(api.GroupName).GroupVersion) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -471,7 +470,7 @@ func TestTemplateStrings(t *testing.T) { t.Fatalf("tmpl fail: %v", err) } - printer := NewVersionedPrinter(p, api.Scheme, registered.GroupOrDie(api.GroupName).GroupVersion) + printer := NewVersionedPrinter(p, api.Scheme, api.Registry.GroupOrDie(api.GroupName).GroupVersion) for name, item := range table { buffer := &bytes.Buffer{} diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 887ff69f43..8b20d4a94d 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -26,7 +26,6 @@ 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/runtime/schema" @@ -1493,7 +1492,7 @@ func TestUpdateRcWithRetries(t *testing.T) { } }), } - clientConfig := &restclient.Config{APIPath: "/api", ContentConfig: restclient.ContentConfig{NegotiatedSerializer: api.Codecs, GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + clientConfig := &restclient.Config{APIPath: "/api", ContentConfig: restclient.ContentConfig{NegotiatedSerializer: api.Codecs, GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} restClient, _ := restclient.RESTClientFor(clientConfig) restClient.Client = fakeClient.Client clientset := internalclientset.New(restClient) @@ -1593,7 +1592,7 @@ func TestAddDeploymentHash(t *testing.T) { } }), } - clientConfig := &restclient.Config{APIPath: "/api", ContentConfig: restclient.ContentConfig{NegotiatedSerializer: api.Codecs, GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}} + clientConfig := &restclient.Config{APIPath: "/api", ContentConfig: restclient.ContentConfig{NegotiatedSerializer: api.Codecs, GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}} restClient, _ := restclient.RESTClientFor(clientConfig) restClient.Client = fakeClient.Client clientset := internalclientset.New(restClient) diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index b6a50c5850..1152b69c2d 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -198,7 +198,6 @@ go_test( "//vendor:github.com/google/cadvisor/info/v2", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", - "//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", diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD index 08adcee6cb..5a88825f8c 100644 --- a/pkg/kubelet/config/BUILD +++ b/pkg/kubelet/config/BUILD @@ -38,7 +38,6 @@ go_library( "//pkg/util/hash:go_default_library", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/exp/inotify", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/sets", @@ -69,7 +68,6 @@ go_test( "//pkg/kubelet/types:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/util/testing: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/types", diff --git a/pkg/kubelet/config/common.go b/pkg/kubelet/config/common.go index ecb5fd10cb..82c499a737 100644 --- a/pkg/kubelet/config/common.go +++ b/pkg/kubelet/config/common.go @@ -22,7 +22,6 @@ import ( "encoding/hex" "fmt" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" utilyaml "k8s.io/apimachinery/pkg/util/yaml" @@ -83,7 +82,7 @@ func getSelfLink(name, namespace string) string { if len(namespace) == 0 { namespace = api.NamespaceDefault } - selfLink = fmt.Sprintf("/api/"+registered.GroupOrDie(api.GroupName).GroupVersion.Version+"/pods/namespaces/%s/%s", name, namespace) + selfLink = fmt.Sprintf("/api/"+api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version+"/pods/namespaces/%s/%s", name, namespace) return selfLink } diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go index 7019d94351..b1a5c00d10 100644 --- a/pkg/kubelet/config/common_test.go +++ b/pkg/kubelet/config/common_test.go @@ -20,7 +20,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/kubernetes/pkg/api" @@ -71,7 +70,7 @@ func TestDecodeSinglePod(t *testing.T) { t.Errorf("expected:\n%#v\ngot:\n%#v\n%s", pod, podOut, string(json)) } - for _, gv := range registered.EnabledVersionsForGroup(v1.GroupName) { + for _, gv := range api.Registry.EnabledVersionsForGroup(v1.GroupName) { info, _ := runtime.SerializerInfoForMediaType(api.Codecs.SupportedMediaTypes(), "application/yaml") encoder := api.Codecs.EncoderForVersion(info.Serializer, gv) yaml, err := runtime.Encode(encoder, pod) @@ -134,7 +133,7 @@ func TestDecodePodList(t *testing.T) { t.Errorf("expected:\n%#v\ngot:\n%#v\n%s", podList, &podListOut, string(json)) } - for _, gv := range registered.EnabledVersionsForGroup(v1.GroupName) { + for _, gv := range api.Registry.EnabledVersionsForGroup(v1.GroupName) { info, _ := runtime.SerializerInfoForMediaType(api.Codecs.SupportedMediaTypes(), "application/yaml") encoder := api.Codecs.EncoderForVersion(info.Serializer, gv) yaml, err := runtime.Encode(encoder, podList) diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index c27a137e70..a87eb82752 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_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/runtime" "k8s.io/apimachinery/pkg/types" @@ -70,7 +69,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Invalid volume name", pod: &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Volumes: []v1.Volume{{Name: "_INVALID_"}}, }, @@ -79,7 +78,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Duplicate volume names", pod: &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Volumes: []v1.Volume{{Name: "repeated"}, {Name: "repeated"}}, }, @@ -88,7 +87,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Unspecified container name", pod: &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Containers: []v1.Container{{Name: ""}}, }, @@ -97,7 +96,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Invalid container name", pod: &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Containers: []v1.Container{{Name: "_INVALID_"}}, }, @@ -320,7 +319,7 @@ func TestExtractPodsFromHTTP(t *testing.T) { func TestURLWithHeader(t *testing.T) { pod := &v1.Pod{ TypeMeta: metav1.TypeMeta{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), Kind: "Pod", }, ObjectMeta: v1.ObjectMeta{ diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index 08c3f0b9ec..5abab43a92 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -57,9 +57,9 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", ], diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index a485a69542..86b5e67b8d 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -19,8 +19,8 @@ package container import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" ) @@ -67,14 +67,14 @@ func TestGenerateContainerRef(t *testing.T) { okPod = v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: "ok", Namespace: "test-ns", UID: "bar", ResourceVersion: "42", - SelfLink: "/api/" + registered.GroupOrDie(v1.GroupName).GroupVersion.String() + "/pods/foo", + SelfLink: "/api/" + api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() + "/pods/foo", }, Spec: v1.PodSpec{ Containers: []v1.Container{ @@ -91,7 +91,7 @@ func TestGenerateContainerRef(t *testing.T) { noSelfLinkPod.Kind = "" noSelfLinkPod.APIVersion = "" noSelfLinkPod.ObjectMeta.SelfLink = "" - defaultedSelfLinkPod.ObjectMeta.SelfLink = "/api/" + registered.GroupOrDie(v1.GroupName).GroupVersion.String() + "/pods/ok" + defaultedSelfLinkPod.ObjectMeta.SelfLink = "/api/" + api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() + "/pods/ok" cases := []struct { name string @@ -108,7 +108,7 @@ func TestGenerateContainerRef(t *testing.T) { }, expected: &v1.ObjectReference{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), Name: "ok", Namespace: "test-ns", UID: "bar", @@ -123,7 +123,7 @@ func TestGenerateContainerRef(t *testing.T) { container: &v1.Container{}, expected: &v1.ObjectReference{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), Name: "ok", Namespace: "test-ns", UID: "bar", @@ -147,7 +147,7 @@ func TestGenerateContainerRef(t *testing.T) { }, expected: &v1.ObjectReference{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), Name: "ok", Namespace: "test-ns", UID: "bar", @@ -164,7 +164,7 @@ func TestGenerateContainerRef(t *testing.T) { }, expected: &v1.ObjectReference{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), Name: "ok", Namespace: "test-ns", UID: "bar", diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index 836c934403..0d08d133ac 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/testing/core" @@ -423,7 +423,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NAME", ValueFrom: &v1.EnvVarSource{ FieldRef: &v1.ObjectFieldSelector{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), FieldPath: "metadata.name", }, }, @@ -432,7 +432,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NAMESPACE", ValueFrom: &v1.EnvVarSource{ FieldRef: &v1.ObjectFieldSelector{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), FieldPath: "metadata.namespace", }, }, @@ -441,7 +441,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NODE_NAME", ValueFrom: &v1.EnvVarSource{ FieldRef: &v1.ObjectFieldSelector{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), FieldPath: "spec.nodeName", }, }, @@ -450,7 +450,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_SERVICE_ACCOUNT_NAME", ValueFrom: &v1.EnvVarSource{ FieldRef: &v1.ObjectFieldSelector{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), FieldPath: "spec.serviceAccountName", }, }, @@ -459,7 +459,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_IP", ValueFrom: &v1.EnvVarSource{ FieldRef: &v1.ObjectFieldSelector{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), FieldPath: "status.podIP", }, }, @@ -489,7 +489,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NAME", ValueFrom: &v1.EnvVarSource{ FieldRef: &v1.ObjectFieldSelector{ - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), FieldPath: "metadata.name", }, }, diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 495c3dbba0..611b43c554 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -76,7 +76,6 @@ go_library( "//pkg/util/node:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", - "//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/util/net", @@ -127,7 +126,6 @@ go_test( "//vendor:github.com/go-openapi/strfmt", "//vendor:github.com/go-openapi/validate", "//vendor:github.com/stretchr/testify/assert", - "//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", diff --git a/pkg/master/import_known_versions.go b/pkg/master/import_known_versions.go index bbc93275fb..61e44ab9b7 100644 --- a/pkg/master/import_known_versions.go +++ b/pkg/master/import_known_versions.go @@ -20,7 +20,7 @@ package master 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" @@ -37,7 +37,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)) } } diff --git a/pkg/master/import_known_versions_test.go b/pkg/master/import_known_versions_test.go index 660da9253e..1332c9cb80 100644 --- a/pkg/master/import_known_versions_test.go +++ b/pkg/master/import_known_versions_test.go @@ -22,7 +22,6 @@ import ( "strings" "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" @@ -51,7 +50,7 @@ func TestGroupVersions(t *testing.T) { t.Errorf("No additional unnamespaced groups should be created") } - for _, gv := range registered.RegisteredGroupVersions() { + for _, gv := range api.Registry.RegisteredGroupVersions() { if !strings.HasSuffix(gv.Group, ".k8s.io") && !legacyUnsuffixedGroups.Has(gv.Group) { t.Errorf("Group %s does not have the standard kubernetes API group suffix of .k8s.io", gv.Group) } diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 1b3502e3ef..cce208eaff 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -26,7 +26,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" @@ -69,7 +68,7 @@ func setUp(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert. } resourceEncoding := genericapiserver.NewDefaultResourceEncodingConfig() - resourceEncoding.SetVersionEncoding(api.GroupName, registered.GroupOrDie(api.GroupName).GroupVersion, schema.GroupVersion{Group: api.GroupName, Version: runtime.APIVersionInternal}) + resourceEncoding.SetVersionEncoding(api.GroupName, api.Registry.GroupOrDie(api.GroupName).GroupVersion, schema.GroupVersion{Group: api.GroupName, Version: runtime.APIVersionInternal}) resourceEncoding.SetVersionEncoding(autoscaling.GroupName, *testapi.Autoscaling.GroupVersion(), schema.GroupVersion{Group: autoscaling.GroupName, Version: runtime.APIVersionInternal}) resourceEncoding.SetVersionEncoding(batch.GroupName, *testapi.Batch.GroupVersion(), schema.GroupVersion{Group: batch.GroupName, Version: runtime.APIVersionInternal}) resourceEncoding.SetVersionEncoding(apps.GroupName, *testapi.Apps.GroupVersion(), schema.GroupVersion{Group: apps.GroupName, Version: runtime.APIVersionInternal}) diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index a2c7b447bf..643ac8295c 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -26,7 +26,6 @@ go_library( "//pkg/storage/storagebackend:go_default_library", "//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/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 6d4fde2596..a1936aec06 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -24,7 +24,6 @@ import ( "github.com/golang/glog" "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" @@ -287,7 +286,7 @@ func (m *ThirdPartyResourceServer) InstallThirdPartyResource(rsrc *extensions.Th m.genericAPIServer.HandlerContainer.Add(genericapi.NewGroupWebService(api.Codecs, path, apiGroup)) m.addThirdPartyResourceStorage(path, plural.Resource, thirdparty.Storage[plural.Resource].(*thirdpartyresourcedatastore.REST), apiGroup) - registered.AddThirdPartyAPIGroupVersions(schema.GroupVersion{Group: group, Version: rsrc.Versions[0].Name}) + api.Registry.AddThirdPartyAPIGroupVersions(schema.GroupVersion{Group: group, Version: rsrc.Versions[0].Name}) return nil } @@ -306,7 +305,7 @@ func (m *ThirdPartyResourceServer) thirdpartyapi(group, kind, version, pluralRes pluralResource: resourceStorage, } - optionsExternalVersion := registered.GroupOrDie(api.GroupName).GroupVersion + optionsExternalVersion := api.Registry.GroupOrDie(api.GroupName).GroupVersion internalVersion := schema.GroupVersion{Group: group, Version: runtime.APIVersionInternal} externalVersion := schema.GroupVersion{Group: group, Version: version} @@ -320,8 +319,8 @@ func (m *ThirdPartyResourceServer) thirdpartyapi(group, kind, version, pluralRes Copier: api.Scheme, Typer: api.Scheme, - Mapper: thirdpartyresourcedata.NewMapper(registered.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group), - Linker: registered.GroupOrDie(extensions.GroupName).SelfLinker, + Mapper: thirdpartyresourcedata.NewMapper(api.Registry.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group), + Linker: api.Registry.GroupOrDie(extensions.GroupName).SelfLinker, Storage: storage, OptionsExternalVersion: &optionsExternalVersion, diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index 4c7b638c04..4e168df984 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -41,7 +41,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/configmap/strategy_test.go b/pkg/registry/core/configmap/strategy_test.go index 73918791fe..063b7ce569 100644 --- a/pkg/registry/core/configmap/strategy_test.go +++ b/pkg/registry/core/configmap/strategy_test.go @@ -19,7 +19,6 @@ package configmap import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" @@ -72,7 +71,7 @@ func TestConfigMapStrategy(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "ConfigMap", ConfigMapToSelectableFields(&api.ConfigMap{}), nil, diff --git a/pkg/registry/core/controller/BUILD b/pkg/registry/core/controller/BUILD index 3c44c42669..4b89e61c62 100644 --- a/pkg/registry/core/controller/BUILD +++ b/pkg/registry/core/controller/BUILD @@ -41,7 +41,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/controller/strategy_test.go b/pkg/registry/core/controller/strategy_test.go index eef8b82b00..c13dfb778d 100644 --- a/pkg/registry/core/controller/strategy_test.go +++ b/pkg/registry/core/controller/strategy_test.go @@ -19,7 +19,6 @@ package controller import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" @@ -144,7 +143,7 @@ func TestControllerStatusStrategy(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "ReplicationController", ControllerToSelectableFields(&api.ReplicationController{}), nil, diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index e2b422e996..3c00d448d0 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -41,7 +41,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/endpoint/strategy_test.go b/pkg/registry/core/endpoint/strategy_test.go index c4ae41cb3e..b520dd4c9d 100644 --- a/pkg/registry/core/endpoint/strategy_test.go +++ b/pkg/registry/core/endpoint/strategy_test.go @@ -19,14 +19,13 @@ package endpoint import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Endpoints", EndpointsToSelectableFields(&api.Endpoints{}), nil, diff --git a/pkg/registry/core/event/BUILD b/pkg/registry/core/event/BUILD index 406a0c7b64..45f6461bc8 100644 --- a/pkg/registry/core/event/BUILD +++ b/pkg/registry/core/event/BUILD @@ -37,7 +37,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/fields:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/util/diff", ], ) diff --git a/pkg/registry/core/event/strategy_test.go b/pkg/registry/core/event/strategy_test.go index a9a2925f3d..8bc4843e10 100644 --- a/pkg/registry/core/event/strategy_test.go +++ b/pkg/registry/core/event/strategy_test.go @@ -20,7 +20,6 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" @@ -51,7 +50,7 @@ func TestGetAttrs(t *testing.T) { Name: "foo", Namespace: "baz", UID: "long uid string", - APIVersion: registered.GroupOrDie(api.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), ResourceVersion: "0", FieldPath: "", }, @@ -67,7 +66,7 @@ func TestGetAttrs(t *testing.T) { "involvedObject.name": "foo", "involvedObject.namespace": "baz", "involvedObject.uid": "long uid string", - "involvedObject.apiVersion": registered.GroupOrDie(api.GroupName).GroupVersion.String(), + "involvedObject.apiVersion": api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "involvedObject.resourceVersion": "0", "involvedObject.fieldPath": "", "reason": "ForTesting", @@ -82,7 +81,7 @@ func TestGetAttrs(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { fset := EventToSelectableFields(&api.Event{}) apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Event", fset, nil, diff --git a/pkg/registry/core/limitrange/BUILD b/pkg/registry/core/limitrange/BUILD index 68c65ce5b5..d54f36e08e 100644 --- a/pkg/registry/core/limitrange/BUILD +++ b/pkg/registry/core/limitrange/BUILD @@ -36,7 +36,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/limitrange/strategy_test.go b/pkg/registry/core/limitrange/strategy_test.go index 72fb9025ab..8c7c98e6ef 100644 --- a/pkg/registry/core/limitrange/strategy_test.go +++ b/pkg/registry/core/limitrange/strategy_test.go @@ -19,14 +19,13 @@ package limitrange import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "LimitRange", LimitRangeToSelectableFields(&api.LimitRange{}), nil, diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index 29e56ec909..f8760dbcc9 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -41,7 +41,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", ], ) diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index 314b8b1ae6..3707949752 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -19,7 +19,6 @@ package namespace import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" @@ -136,7 +135,7 @@ func TestNamespaceFinalizeStrategy(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Namespace", NamespaceToSelectableFields(&api.Namespace{}), map[string]string{"name": "metadata.name"}, diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 346595938d..3dfd15ea2b 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -45,7 +45,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/fields:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/labels", ], ) diff --git a/pkg/registry/core/node/strategy_test.go b/pkg/registry/core/node/strategy_test.go index 545500bca9..4236daccf3 100644 --- a/pkg/registry/core/node/strategy_test.go +++ b/pkg/registry/core/node/strategy_test.go @@ -19,7 +19,6 @@ package node import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/labels" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" @@ -49,7 +48,7 @@ func TestMatchNode(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Node", NodeToSelectableFields(&api.Node{}), nil, diff --git a/pkg/registry/core/persistentvolume/BUILD b/pkg/registry/core/persistentvolume/BUILD index cbe0174d1e..c146e31132 100644 --- a/pkg/registry/core/persistentvolume/BUILD +++ b/pkg/registry/core/persistentvolume/BUILD @@ -36,7 +36,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/persistentvolume/strategy_test.go b/pkg/registry/core/persistentvolume/strategy_test.go index db38cfeedf..65b975e8b9 100644 --- a/pkg/registry/core/persistentvolume/strategy_test.go +++ b/pkg/registry/core/persistentvolume/strategy_test.go @@ -19,14 +19,13 @@ package persistentvolume import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "PersistentVolume", PersistentVolumeToSelectableFields(&api.PersistentVolume{}), map[string]string{"name": "metadata.name"}, diff --git a/pkg/registry/core/persistentvolumeclaim/BUILD b/pkg/registry/core/persistentvolumeclaim/BUILD index 55bc5a050a..ae9e39e98f 100644 --- a/pkg/registry/core/persistentvolumeclaim/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/BUILD @@ -36,7 +36,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/persistentvolumeclaim/strategy_test.go b/pkg/registry/core/persistentvolumeclaim/strategy_test.go index e9a6d13669..e8fe5e6027 100644 --- a/pkg/registry/core/persistentvolumeclaim/strategy_test.go +++ b/pkg/registry/core/persistentvolumeclaim/strategy_test.go @@ -19,14 +19,13 @@ package persistentvolumeclaim import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "PersistentVolumeClaim", PersistentVolumeClaimToSelectableFields(&api.PersistentVolumeClaim{}), map[string]string{"name": "metadata.name"}, diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index 0d4a6ab525..6f6380ca96 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -46,7 +46,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/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index a8b3feb6e5..9708ea1747 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -20,7 +20,6 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -328,7 +327,7 @@ func TestCheckLogLocation(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Pod", PodToSelectableFields(&api.Pod{}), nil, diff --git a/pkg/registry/core/podtemplate/BUILD b/pkg/registry/core/podtemplate/BUILD index c900b96306..dc9ee40944 100644 --- a/pkg/registry/core/podtemplate/BUILD +++ b/pkg/registry/core/podtemplate/BUILD @@ -35,7 +35,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/podtemplate/strategy_test.go b/pkg/registry/core/podtemplate/strategy_test.go index 1ca8d7f60e..0f82101df0 100644 --- a/pkg/registry/core/podtemplate/strategy_test.go +++ b/pkg/registry/core/podtemplate/strategy_test.go @@ -19,14 +19,13 @@ package podtemplate import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "PodTemplate", PodTemplateToSelectableFields(&api.PodTemplate{}), nil, diff --git a/pkg/registry/core/resourcequota/BUILD b/pkg/registry/core/resourcequota/BUILD index 40c4cd0004..bd19912e71 100644 --- a/pkg/registry/core/resourcequota/BUILD +++ b/pkg/registry/core/resourcequota/BUILD @@ -38,7 +38,6 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/resourcequota/strategy_test.go b/pkg/registry/core/resourcequota/strategy_test.go index 8bcc087bce..548b45532a 100644 --- a/pkg/registry/core/resourcequota/strategy_test.go +++ b/pkg/registry/core/resourcequota/strategy_test.go @@ -19,7 +19,6 @@ package resourcequota import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" apitesting "k8s.io/kubernetes/pkg/api/testing" @@ -62,7 +61,7 @@ func TestResourceQuotaStrategy(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "ResourceQuota", ResourceQuotaToSelectableFields(&api.ResourceQuota{}), nil, diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index bef0ff48fb..996be6288d 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -57,7 +57,6 @@ go_library( "//pkg/registry/generic:go_default_library", "//pkg/storage/etcd/util: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/net", ], diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index 9f1006dfc9..ba679f3484 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -27,7 +27,6 @@ import ( "github.com/golang/glog" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/kubernetes/pkg/api" @@ -90,19 +89,19 @@ type LegacyRESTStorage struct { func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generic.RESTOptionsGetter) (LegacyRESTStorage, genericapiserver.APIGroupInfo, error) { apiGroupInfo := genericapiserver.APIGroupInfo{ - GroupMeta: *registered.GroupOrDie(api.GroupName), + GroupMeta: *api.Registry.GroupOrDie(api.GroupName), VersionedResourcesStorageMap: map[string]map[string]rest.Storage{}, Scheme: api.Scheme, ParameterCodec: api.ParameterCodec, NegotiatedSerializer: api.Codecs, SubresourceGroupVersionKind: map[string]schema.GroupVersionKind{}, } - if autoscalingGroupVersion := (schema.GroupVersion{Group: "autoscaling", Version: "v1"}); registered.IsEnabledVersion(autoscalingGroupVersion) { + if autoscalingGroupVersion := (schema.GroupVersion{Group: "autoscaling", Version: "v1"}); api.Registry.IsEnabledVersion(autoscalingGroupVersion) { apiGroupInfo.SubresourceGroupVersionKind["replicationcontrollers/scale"] = autoscalingGroupVersion.WithKind("Scale") } var podDisruptionClient policyclient.PodDisruptionBudgetsGetter - if policyGroupVersion := (schema.GroupVersion{Group: "policy", Version: "v1beta1"}); registered.IsEnabledVersion(policyGroupVersion) { + if policyGroupVersion := (schema.GroupVersion{Group: "policy", Version: "v1beta1"}); api.Registry.IsEnabledVersion(policyGroupVersion) { apiGroupInfo.SubresourceGroupVersionKind["pods/eviction"] = policyGroupVersion.WithKind("Eviction") var err error @@ -223,10 +222,10 @@ func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generi "componentStatuses": componentstatus.NewStorage(componentStatusStorage{c.StorageFactory}.serversToValidate), } - if registered.IsEnabledVersion(schema.GroupVersion{Group: "autoscaling", Version: "v1"}) { + if api.Registry.IsEnabledVersion(schema.GroupVersion{Group: "autoscaling", Version: "v1"}) { restStorageMap["replicationControllers/scale"] = controllerStorage.Scale } - if registered.IsEnabledVersion(schema.GroupVersion{Group: "policy", Version: "v1beta1"}) { + if api.Registry.IsEnabledVersion(schema.GroupVersion{Group: "policy", Version: "v1beta1"}) { restStorageMap["pods/eviction"] = podStorage.Eviction } apiGroupInfo.VersionedResourcesStorageMap["v1"] = restStorageMap diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index 183eca9d21..82beb05e0f 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -42,7 +42,6 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/core/secret/strategy_test.go b/pkg/registry/core/secret/strategy_test.go index 95554b08d8..e5d24b7d2e 100644 --- a/pkg/registry/core/secret/strategy_test.go +++ b/pkg/registry/core/secret/strategy_test.go @@ -20,7 +20,6 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" @@ -103,7 +102,7 @@ func TestExportSecret(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Secret", SelectableFields(&api.Secret{}), nil, diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 7c54512ff5..e04f5c96f9 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -65,7 +65,6 @@ go_test( "//pkg/registry/registrytest:go_default_library", "//pkg/util/config:go_default_library", "//pkg/util/intstr: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/util/net", diff --git a/pkg/registry/core/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go index 0bb770c95c..e01a46a9d9 100644 --- a/pkg/registry/core/service/strategy_test.go +++ b/pkg/registry/core/service/strategy_test.go @@ -20,7 +20,6 @@ import ( "reflect" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" @@ -214,7 +213,7 @@ func TestBeforeUpdate(t *testing.T) { func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "Service", ServiceToSelectableFields(&api.Service{}), nil, diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index 48b6080dae..c62e5874f7 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -40,7 +40,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/pkg/registry/core/serviceaccount/strategy_test.go b/pkg/registry/core/serviceaccount/strategy_test.go index 3287d4dc0e..76b1cdc57c 100644 --- a/pkg/registry/core/serviceaccount/strategy_test.go +++ b/pkg/registry/core/serviceaccount/strategy_test.go @@ -19,14 +19,13 @@ package serviceaccount import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestSelectableFieldLabelConversions(t *testing.T) { apitesting.TestSelectableFieldLabelConversionsOfKind(t, - registered.GroupOrDie(api.GroupName).GroupVersion.String(), + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String(), "ServiceAccount", SelectableFields(&api.ServiceAccount{}), nil, diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index 426efdb3da..ecc213aeda 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/genericapiserver/api/request:go_default_library", "//pkg/storage:go_default_library", "//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/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -56,7 +55,6 @@ go_test( "//pkg/api/testing:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions: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", diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index 52eec4e2ec..52210bb491 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -25,7 +25,6 @@ import ( "strings" "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" @@ -143,7 +142,7 @@ func (t *thirdPartyResourceDataMapper) RESTMapping(gk schema.GroupKind, versions // TODO figure out why we're doing this rewriting extensionGK := schema.GroupKind{Group: extensions.GroupName, Kind: "ThirdPartyResourceData"} - mapping, err := t.mapper.RESTMapping(extensionGK, registered.GroupOrDie(extensions.GroupName).GroupVersion.Version) + mapping, err := t.mapper.RESTMapping(extensionGK, api.Registry.GroupOrDie(extensions.GroupName).GroupVersion.Version) if err != nil { return nil, err } @@ -334,7 +333,7 @@ func IsThirdPartyObject(rawData []byte, gvk *schema.GroupVersionKind) (isThirdPa gv = gvk.GroupVersion() gvkOut = gvk } - return registered.IsThirdPartyAPIGroupVersion(gv), gvkOut, nil + return api.Registry.IsThirdPartyAPIGroupVersion(gv), gvkOut, nil } func (t *thirdPartyResourceDataDecoder) Decode(data []byte, gvk *schema.GroupVersionKind, into runtime.Object) (runtime.Object, *schema.GroupVersionKind, error) { @@ -369,7 +368,7 @@ func (t *thirdPartyResourceDataDecoder) Decode(data []byte, gvk *schema.GroupVer } return o, outGVK, nil default: - if gvk != nil && registered.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) { + if gvk != nil && api.Registry.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) { // delegate won't recognize a thirdparty group version gvk = nil } @@ -581,7 +580,7 @@ func (t *thirdPartyResourceDataCreator) New(kind schema.GroupVersionKind) (out r case "ListOptions", "WatchEvent": if apiutil.GetGroupVersion(t.group, t.version) == kind.GroupVersion().String() { // Translate third party group to external group. - gvk := registered.EnabledVersionsForGroup(api.GroupName)[0].WithKind(kind.Kind) + gvk := api.Registry.EnabledVersionsForGroup(api.GroupName)[0].WithKind(kind.Kind) return t.delegate.New(gvk) } return t.delegate.New(kind) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go index 86e9544b73..92afcd8c96 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_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/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -121,7 +120,7 @@ func TestCodec(t *testing.T) { name: "labels", }, } - registered.AddThirdPartyAPIGroupVersions(schema.GroupVersion{Group: "company.com", Version: "v1"}) + api.Registry.AddThirdPartyAPIGroupVersions(schema.GroupVersion{Group: "company.com", Version: "v1"}) for _, test := range tests { d := &thirdPartyResourceDataDecoder{kind: "Foo", delegate: testapi.Extensions.Codec()} e := &thirdPartyResourceDataEncoder{gvk: schema.GroupVersionKind{ diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 4329da051e..28874ef28f 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/storage/storagebackend:go_default_library", "//pkg/storage/testing:go_default_library", "//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/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index cb2ea728a4..2e34bc3e1e 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -21,7 +21,6 @@ import ( "testing" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -164,7 +163,7 @@ func getCodec(obj runtime.Object) (runtime.Codec, error) { // split the schemes for internal objects. // TODO: caesarxuchao: we should add a map from kind to group in Scheme. var codec runtime.Codec - if api.Scheme.Recognizes(registered.GroupOrDie(api.GroupName).GroupVersion.WithKind(fqKind.Kind)) { + if api.Scheme.Recognizes(api.Registry.GroupOrDie(api.GroupName).GroupVersion.WithKind(fqKind.Kind)) { codec = testapi.Default.Codec() } else if api.Scheme.Recognizes(testapi.Extensions.GroupVersion().WithKind(fqKind.Kind)) { codec = testapi.Extensions.Codec() diff --git a/pkg/storage/etcd/BUILD b/pkg/storage/etcd/BUILD index 2b0f3db1d8..10b101a90c 100644 --- a/pkg/storage/etcd/BUILD +++ b/pkg/storage/etcd/BUILD @@ -57,7 +57,6 @@ go_test( "//pkg/storage/testing:go_default_library", "//vendor:github.com/coreos/etcd/client", "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go index 0d9719e532..aa1d9dedce 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/pkg/storage/etcd/etcd_helper_test.go @@ -25,7 +25,6 @@ import ( etcd "github.com/coreos/etcd/client" "golang.org/x/net/context" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -44,7 +43,7 @@ import ( func testScheme(t *testing.T) (*runtime.Scheme, runtime.Codec) { scheme := runtime.NewScheme() scheme.Log(t) - scheme.AddKnownTypes(registered.GroupOrDie(api.GroupName).GroupVersion, &storagetesting.TestResource{}) + scheme.AddKnownTypes(api.Registry.GroupOrDie(api.GroupName).GroupVersion, &storagetesting.TestResource{}) scheme.AddKnownTypes(testapi.Default.InternalGroupVersion(), &storagetesting.TestResource{}) if err := scheme.AddConversionFuncs( func(in *storagetesting.TestResource, out *storagetesting.TestResource, s conversion.Scope) error { @@ -58,7 +57,7 @@ func testScheme(t *testing.T) (*runtime.Scheme, runtime.Codec) { ); err != nil { panic(err) } - codec := serializer.NewCodecFactory(scheme).LegacyCodec(registered.GroupOrDie(api.GroupName).GroupVersion) + codec := serializer.NewCodecFactory(scheme).LegacyCodec(api.Registry.GroupOrDie(api.GroupName).GroupVersion) return scheme, codec } diff --git a/pkg/util/io/BUILD b/pkg/util/io/BUILD index 52492504c2..bc16770289 100644 --- a/pkg/util/io/BUILD +++ b/pkg/util/io/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) @@ -34,7 +33,6 @@ go_test( "//pkg/util/testing:go_default_library", "//pkg/volume:go_default_library", "//vendor:github.com/pborman/uuid", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/util/io/io.go b/pkg/util/io/io.go index 5205d4bc1e..0be8e12726 100644 --- a/pkg/util/io/io.go +++ b/pkg/util/io/io.go @@ -21,7 +21,6 @@ import ( "io/ioutil" "os" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" @@ -41,7 +40,7 @@ func LoadPodFromFile(filePath string) (*v1.Pod, error) { } pod := &v1.Pod{} - codec := api.Codecs.LegacyCodec(registered.GroupOrDie(v1.GroupName).GroupVersion) + codec := api.Codecs.LegacyCodec(api.Registry.GroupOrDie(v1.GroupName).GroupVersion) if err := runtime.DecodeInto(codec, podDef, pod); err != nil { return nil, fmt.Errorf("failed decoding file: %v", err) } @@ -53,7 +52,7 @@ func SavePodToFile(pod *v1.Pod, filePath string, perm os.FileMode) error { if filePath == "" { return fmt.Errorf("file path not specified") } - codec := api.Codecs.LegacyCodec(registered.GroupOrDie(v1.GroupName).GroupVersion) + codec := api.Codecs.LegacyCodec(api.Registry.GroupOrDie(v1.GroupName).GroupVersion) data, err := runtime.Encode(codec, pod) if err != nil { return fmt.Errorf("failed encoding pod: %v", err) diff --git a/pkg/util/io/io_test.go b/pkg/util/io/io_test.go index 6119ff86f0..688e4f25e5 100644 --- a/pkg/util/io/io_test.go +++ b/pkg/util/io/io_test.go @@ -22,7 +22,6 @@ import ( "testing" "github.com/pborman/uuid" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/util/io" @@ -34,7 +33,7 @@ func TestSavePodToFile(t *testing.T) { pod := volume.NewPersistentVolumeRecyclerPodTemplate() // sets all default values on a pod for equality comparison after decoding from file - codec := api.Codecs.LegacyCodec(registered.GroupOrDie(api.GroupName).GroupVersion) + codec := api.Codecs.LegacyCodec(api.Registry.GroupOrDie(api.GroupName).GroupVersion) encoded, err := runtime.Encode(codec, pod) runtime.DecodeInto(codec, encoded, pod) diff --git a/plugin/pkg/admission/imagepolicy/BUILD b/plugin/pkg/admission/imagepolicy/BUILD index 97a6a3fa32..e768defae6 100644 --- a/plugin/pkg/admission/imagepolicy/BUILD +++ b/plugin/pkg/admission/imagepolicy/BUILD @@ -19,6 +19,7 @@ go_library( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", + "//pkg/apis/imagepolicy/install:go_default_library", "//plugin/pkg/webhook:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/plugin/pkg/admission/imagepolicy/admission.go b/plugin/pkg/admission/imagepolicy/admission.go index 6eb42dca7f..b1370c5888 100644 --- a/plugin/pkg/admission/imagepolicy/admission.go +++ b/plugin/pkg/admission/imagepolicy/admission.go @@ -42,6 +42,7 @@ import ( // install the clientgo image policy API for use with api registry _ "k8s.io/client-go/pkg/apis/imagepolicy/install" + _ "k8s.io/kubernetes/pkg/apis/imagepolicy/install" ) var ( diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index 017f393faa..0052169958 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -13,6 +13,7 @@ go_library( srcs = ["webhook.go"], tags = ["automanaged"], deps = [ + "//pkg/apis/authentication/install:go_default_library", "//plugin/pkg/webhook:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/authenticator", "//vendor:k8s.io/apiserver/pkg/authentication/user", diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index bb85695eb1..181a6ea978 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go @@ -30,6 +30,7 @@ import ( "k8s.io/kubernetes/plugin/pkg/webhook" _ "k8s.io/client-go/pkg/apis/authentication/install" + _ "k8s.io/kubernetes/pkg/apis/authentication/install" ) var ( diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index 95e461ca0e..3f213fe4e9 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -19,6 +19,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/util/cache", "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", + "//vendor:k8s.io/client-go/pkg/apis/authorization/install", "//vendor:k8s.io/client-go/pkg/apis/authorization/v1beta1", "//vendor:k8s.io/client-go/pkg/runtime/schema", ], diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go index 4a8c89a6af..e7bd6d50e0 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook.go @@ -31,6 +31,7 @@ import ( "k8s.io/kubernetes/plugin/pkg/webhook" + _ "k8s.io/client-go/pkg/apis/authorization/install" _ "k8s.io/kubernetes/pkg/apis/authorization/install" ) diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD b/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD index 7cb21e2230..f76e56685c 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/BUILD @@ -32,6 +32,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/restclient:go_default_library", @@ -39,7 +40,6 @@ go_test( "//plugin/pkg/scheduler/api:go_default_library", "//plugin/pkg/scheduler/api/latest:go_default_library", "//plugin/pkg/scheduler/factory:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", ], diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go b/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go index 3997f305e1..7bbc1a4c04 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/compatibility_test.go @@ -23,9 +23,9 @@ import ( "net/http/httptest" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -338,7 +338,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) if _, err := factory.NewConfigFactory(client, "some-scheduler-name", v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains).CreateFromConfig(policy); err != nil { t.Errorf("%s: Error constructing: %v", v, err) diff --git a/plugin/pkg/scheduler/factory/BUILD b/plugin/pkg/scheduler/factory/BUILD index 602fcb8115..7f258b4e7b 100644 --- a/plugin/pkg/scheduler/factory/BUILD +++ b/plugin/pkg/scheduler/factory/BUILD @@ -49,6 +49,7 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/api/v1:go_default_library", @@ -60,7 +61,6 @@ go_test( "//plugin/pkg/scheduler/api:go_default_library", "//plugin/pkg/scheduler/api/latest:go_default_library", "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/types", ], diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go index 795cac6934..747f88aee5 100644 --- a/plugin/pkg/scheduler/factory/factory_test.go +++ b/plugin/pkg/scheduler/factory/factory_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" "k8s.io/kubernetes/pkg/api/v1" @@ -47,7 +47,7 @@ func TestCreate(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) factory := NewConfigFactory(client, v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) factory.Create() } @@ -65,7 +65,7 @@ func TestCreateFromConfig(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) factory := NewConfigFactory(client, v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) // Pre-register some predicate and priority functions @@ -106,7 +106,7 @@ func TestCreateFromEmptyConfig(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) factory := NewConfigFactory(client, v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) configData = []byte(`{}`) @@ -149,7 +149,7 @@ func TestDefaultErrorFunc(t *testing.T) { mux.Handle(testapi.Default.ResourcePath("pods", "bar", "foo"), &handler) server := httptest.NewServer(mux) defer server.Close() - factory := NewConfigFactory(clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}), v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) + factory := NewConfigFactory(clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}), v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) queue := cache.NewFIFO(cache.MetaNamespaceKeyFunc) podBackoff := podBackoff{ perPodBackoff: map[types.NamespacedName]*backoffEntry{}, @@ -232,7 +232,7 @@ func TestBind(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) b := binder{client} if err := b.Bind(item.binding); err != nil { @@ -317,7 +317,7 @@ func TestResponsibleForPod(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) // factory of "default-scheduler" factoryDefaultScheduler := NewConfigFactory(client, v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) // factory of "foo-scheduler" @@ -381,7 +381,7 @@ func TestInvalidHardPodAffinitySymmetricWeight(t *testing.T) { server := httptest.NewServer(&handler) // TODO: Uncomment when fix #19254 // defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) // factory of "default-scheduler" factory := NewConfigFactory(client, v1.DefaultSchedulerName, -1, v1.DefaultFailureDomains) _, err := factory.Create() @@ -398,7 +398,7 @@ func TestInvalidFactoryArgs(t *testing.T) { } server := httptest.NewServer(&handler) defer server.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: server.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) testCases := []struct { hardPodAffinitySymmetricWeight int diff --git a/plugin/pkg/webhook/BUILD b/plugin/pkg/webhook/BUILD index ace501aa20..11f036554d 100644 --- a/plugin/pkg/webhook/BUILD +++ b/plugin/pkg/webhook/BUILD @@ -12,9 +12,10 @@ go_library( srcs = ["webhook.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/apimachinery/registered", "//vendor:k8s.io/client-go/pkg/apis/authorization/install", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", diff --git a/plugin/pkg/webhook/webhook.go b/plugin/pkg/webhook/webhook.go index 0f2c6fc745..5a88f4fa1b 100755 --- a/plugin/pkg/webhook/webhook.go +++ b/plugin/pkg/webhook/webhook.go @@ -21,16 +21,18 @@ import ( "fmt" "time" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/pkg/api" apierrors "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/apimachinery/registered" "k8s.io/client-go/pkg/runtime" - "k8s.io/client-go/pkg/runtime/schema" + clientschema "k8s.io/client-go/pkg/runtime/schema" runtimeserializer "k8s.io/client-go/pkg/runtime/serializer" "k8s.io/client-go/pkg/util/wait" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + kapi "k8s.io/kubernetes/pkg/api" + _ "k8s.io/client-go/pkg/apis/authorization/install" ) @@ -40,9 +42,9 @@ type GenericWebhook struct { } // NewGenericWebhook creates a new GenericWebhook from the provided kubeconfig file. -func NewGenericWebhook(kubeConfigFile string, groupVersions []schema.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) { +func NewGenericWebhook(kubeConfigFile string, groupVersions []clientschema.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) { for _, groupVersion := range groupVersions { - if !registered.IsEnabledVersion(groupVersion) { + if !kapi.Registry.IsEnabledVersion(schema.GroupVersion{Group: groupVersion.Group, Version: groupVersion.Version}) { return nil, fmt.Errorf("webhook plugin requires enabling extension resource: %s", groupVersion) } } diff --git a/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go index e56bfc0a18..5256be659a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go +++ b/staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go @@ -19,7 +19,6 @@ package registered import ( "fmt" - "os" "sort" "strings" @@ -31,10 +30,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" ) -var ( - DefaultAPIRegistrationManager = NewOrDie(os.Getenv("KUBE_API_VERSIONS")) -) - // APIRegistrationManager provides the concept of what API groups are enabled. // // TODO: currently, it also provides a "registered" concept. But it's wrong to @@ -99,28 +94,6 @@ func NewOrDie(kubeAPIVersions string) *APIRegistrationManager { return m } -// People are calling global functions. Let them continue to do that (for now). -var ( - ValidateEnvRequestedVersions = DefaultAPIRegistrationManager.ValidateEnvRequestedVersions - AllPreferredGroupVersions = DefaultAPIRegistrationManager.AllPreferredGroupVersions - RESTMapper = DefaultAPIRegistrationManager.RESTMapper - GroupOrDie = DefaultAPIRegistrationManager.GroupOrDie - AddThirdPartyAPIGroupVersions = DefaultAPIRegistrationManager.AddThirdPartyAPIGroupVersions - IsThirdPartyAPIGroupVersion = DefaultAPIRegistrationManager.IsThirdPartyAPIGroupVersion - RegisteredGroupVersions = DefaultAPIRegistrationManager.RegisteredGroupVersions - IsRegisteredVersion = DefaultAPIRegistrationManager.IsRegisteredVersion - IsRegistered = DefaultAPIRegistrationManager.IsRegistered - Group = DefaultAPIRegistrationManager.Group - EnabledVersionsForGroup = DefaultAPIRegistrationManager.EnabledVersionsForGroup - EnabledVersions = DefaultAPIRegistrationManager.EnabledVersions - IsEnabledVersion = DefaultAPIRegistrationManager.IsEnabledVersion - IsAllowedVersion = DefaultAPIRegistrationManager.IsAllowedVersion - EnableVersions = DefaultAPIRegistrationManager.EnableVersions - RegisterGroup = DefaultAPIRegistrationManager.RegisterGroup - RegisterVersions = DefaultAPIRegistrationManager.RegisterVersions - InterfacesFor = DefaultAPIRegistrationManager.InterfacesFor -) - // RegisterVersions adds the given group versions to the list of registered group versions. func (m *APIRegistrationManager) RegisterVersions(availableVersions []schema.GroupVersion) { for _, v := range availableVersions { diff --git a/staging/src/k8s.io/client-go/pkg/api/register.go b/staging/src/k8s.io/client-go/pkg/api/register.go index cdf038a67c..7e48e13de1 100644 --- a/staging/src/k8s.io/client-go/pkg/api/register.go +++ b/staging/src/k8s.io/client-go/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/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/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 diff --git a/test/e2e/BUILD b/test/e2e/BUILD index ad215aafa1..8163ddc1a0 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -196,7 +196,6 @@ go_library( "//vendor:google.golang.org/api/compute/v1", "//vendor:google.golang.org/api/googleapi", "//vendor:gopkg.in/inf.v0", - "//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", diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index c35a1f907a..0bb5aa9149 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -30,6 +30,7 @@ go_library( ], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/v1:go_default_library", @@ -47,7 +48,6 @@ go_library( "//vendor:github.com/onsi/ginkgo", "//vendor:github.com/onsi/gomega", "//vendor:golang.org/x/net/websocket", - "//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/util/sets", diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 1921cba8b3..9034736ec7 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -20,8 +20,8 @@ import ( "fmt" "path" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" @@ -315,7 +315,7 @@ func testPodWithVolume(image, path string, source *v1.EmptyDirVolumeSource) *v1. return &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: podName, diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 99824ddc6e..02d8e781dc 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -21,8 +21,8 @@ import ( "os" "path" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/test/e2e/framework" @@ -137,7 +137,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod { return &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: podName, diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index c84282d33a..a4a0683c4f 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -22,7 +22,6 @@ import ( "strings" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -61,12 +60,12 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { AfterEach(func() { if daemonsets, err := f.ClientSet.Extensions().DaemonSets(f.Namespace.Name).List(v1.ListOptions{}); err == nil { - framework.Logf("daemonset: %s", runtime.EncodeOrDie(api.Codecs.LegacyCodec(registered.EnabledVersions()...), daemonsets)) + framework.Logf("daemonset: %s", runtime.EncodeOrDie(api.Codecs.LegacyCodec(api.Registry.EnabledVersions()...), daemonsets)) } else { framework.Logf("unable to dump daemonsets: %v", err) } if pods, err := f.ClientSet.Core().Pods(f.Namespace.Name).List(v1.ListOptions{}); err == nil { - framework.Logf("pods: %s", runtime.EncodeOrDie(api.Codecs.LegacyCodec(registered.EnabledVersions()...), pods)) + framework.Logf("pods: %s", runtime.EncodeOrDie(api.Codecs.LegacyCodec(api.Registry.EnabledVersions()...), pods)) } else { framework.Logf("unable to dump pods: %v", err) } diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 018d097ad3..2cd3aafea6 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -23,7 +23,6 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/wait" @@ -47,7 +46,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string, useAnnotatio dnsPod := &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: "dns-test-" + string(uuid.NewUUID()), diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 838aef0a7c..94c918a2dd 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -98,7 +98,6 @@ go_library( "//vendor:google.golang.org/api/compute/v1", "//vendor:google.golang.org/api/googleapi", "//vendor:gopkg.in/yaml.v2", - "//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", diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 342d165c2f..66857aaec3 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -26,7 +26,6 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" @@ -201,7 +200,7 @@ func (f *Framework) BeforeEach() { clientRepoConfig := getClientRepoConfig(config) f.StagingClient, err = staging.NewForConfig(clientRepoConfig) Expect(err).NotTo(HaveOccurred()) - f.ClientPool = dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + f.ClientPool = dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) } if f.federated { diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index 1173f98b09..891ed04b2b 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -29,12 +29,12 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" "k8s.io/kubernetes/pkg/util/intstr" @@ -321,7 +321,7 @@ func (config *NetworkingTestConfig) createNetShellPodSpec(podName string, node s pod := &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: podName, @@ -365,7 +365,7 @@ func (config *NetworkingTestConfig) createTestPodSpec() *v1.Pod { pod := &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: testPodName, diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index 4ba8ce2092..8b0b6dffcd 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -199,7 +199,7 @@ func RegisterClusterFlags() { // Register flags specific to the node e2e test suite. func RegisterNodeFlags() { - // Mark the test as node e2e when node flags are registered. + // Mark the test as node e2e when node flags are api.Registry. TestContext.NodeE2E = true flag.StringVar(&TestContext.NodeName, "node-name", "", "Name of the node to run tests on.") // TODO(random-liu): Move kubelet start logic out of the test. diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 998d47473b..57f5762591 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -49,7 +49,6 @@ import ( . "github.com/onsi/gomega" gomegatypes "github.com/onsi/gomega/types" - "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/labels" @@ -2380,7 +2379,7 @@ func isNodeUntainted(node *v1.Node) bool { fakePod := &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: "fake-not-scheduled", @@ -5259,7 +5258,7 @@ func RcByNameContainer(name string, replicas int32, image string, labels map[str return &v1.ReplicationController{ TypeMeta: metav1.TypeMeta{ Kind: "ReplicationController", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: name, diff --git a/test/e2e/gke_local_ssd.go b/test/e2e/gke_local_ssd.go index e667a820ff..0845616975 100644 --- a/test/e2e/gke_local_ssd.go +++ b/test/e2e/gke_local_ssd.go @@ -20,8 +20,8 @@ import ( "fmt" "os/exec" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" @@ -74,7 +74,7 @@ func testPodWithSsd(command string) *v1.Pod { return &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: podName, diff --git a/test/e2e/metrics_grabber_test.go b/test/e2e/metrics_grabber_test.go index a3f46b0eac..ab3804a2e9 100644 --- a/test/e2e/metrics_grabber_test.go +++ b/test/e2e/metrics_grabber_test.go @@ -69,7 +69,7 @@ var _ = framework.KubeDescribe("MetricsGrabber", func() { } } if !masterRegistered { - framework.Logf("Master is node registered. Skipping testing Scheduler metrics.") + framework.Logf("Master is node api.Registry. Skipping testing Scheduler metrics.") return } response, err := grabber.GrabFromScheduler() @@ -90,7 +90,7 @@ var _ = framework.KubeDescribe("MetricsGrabber", func() { } } if !masterRegistered { - framework.Logf("Master is node registered. Skipping testing ControllerManager metrics.") + framework.Logf("Master is node api.Registry. Skipping testing ControllerManager metrics.") return } response, err := grabber.GrabFromControllerManager() diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 2442c38977..7bd9aa046b 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -31,9 +31,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" @@ -725,7 +725,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num pod := &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ Name: "pd-test-" + string(uuid.NewUUID()), diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index a427a6b479..b052d06b30 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -22,9 +22,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" @@ -844,7 +844,7 @@ func makePod(ns string, pvcName string, command ...string) *v1.Pod { return &v1.Pod{ TypeMeta: metav1.TypeMeta{ Kind: "Pod", - APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), + APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), }, ObjectMeta: v1.ObjectMeta{ GenerateName: "client-", diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index 7777c6be41..ecc33d9f33 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/util/net" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -49,7 +49,7 @@ const ( ) var _ = framework.KubeDescribe("Proxy", func() { - version := registered.GroupOrDie(v1.GroupName).GroupVersion.Version + version := api.Registry.GroupOrDie(v1.GroupName).GroupVersion.Version Context("version "+version, func() { options := framework.FrameworkOptions{ ClientQPS: -1.0, diff --git a/test/e2e/third-party.go b/test/e2e/third-party.go index 5f43cb2611..6e83760c1f 100644 --- a/test/e2e/third-party.go +++ b/test/e2e/third-party.go @@ -22,7 +22,6 @@ import ( "net/http" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" @@ -97,7 +96,7 @@ var _ = Describe("ThirdParty resources [Flaky] [Disruptive]", func() { return true, nil } status := metav1.Status{} - if err := runtime.DecodeInto(api.Codecs.LegacyCodec(registered.EnabledVersions()...), data, &status); err != nil { + if err := runtime.DecodeInto(api.Codecs.LegacyCodec(api.Registry.EnabledVersions()...), data, &status); err != nil { return false, err } if status.Code != http.StatusNotFound { diff --git a/test/e2e_node/services/BUILD b/test/e2e_node/services/BUILD index 67686467c2..254146bb83 100644 --- a/test/e2e_node/services/BUILD +++ b/test/e2e_node/services/BUILD @@ -23,6 +23,7 @@ go_library( deps = [ "//cmd/kube-apiserver/app:go_default_library", "//cmd/kube-apiserver/app/options:go_default_library", + "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/restclient:go_default_library", @@ -38,7 +39,6 @@ go_library( "//vendor:github.com/coreos/pkg/capnslog", "//vendor:github.com/golang/glog", "//vendor:github.com/kardianos/osext", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/test/e2e_node/services/namespace_controller.go b/test/e2e_node/services/namespace_controller.go index 524a7d580f..bb2f62885f 100644 --- a/test/e2e_node/services/namespace_controller.go +++ b/test/e2e_node/services/namespace_controller.go @@ -19,7 +19,7 @@ package services import ( "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -55,7 +55,7 @@ func (n *NamespaceController) Start() error { if err != nil { return err } - clientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + clientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) discoverResourcesFn := client.Discovery().ServerPreferredNamespacedResources nc := namespacecontroller.NewNamespaceController(client, clientPool, discoverResourcesFn, ncResyncPeriod, v1.FinalizerKubernetes) go nc.Run(ncConcurrency, n.stopCh) diff --git a/test/integration/auth/accessreview_test.go b/test/integration/auth/accessreview_test.go index 12585908d4..b2e37f201e 100644 --- a/test/integration/auth/accessreview_test.go +++ b/test/integration/auth/accessreview_test.go @@ -24,7 +24,6 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" @@ -62,7 +61,7 @@ func TestSubjectAccessReview(t *testing.T) { _, s := framework.RunAMaster(masterConfig) defer s.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}) tests := []struct { name string @@ -156,7 +155,7 @@ func TestSelfSubjectAccessReview(t *testing.T) { _, s := framework.RunAMaster(masterConfig) defer s.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}) tests := []struct { name string @@ -236,7 +235,7 @@ func TestLocalSubjectAccessReview(t *testing.T) { _, s := framework.RunAMaster(masterConfig) defer s.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}) tests := []struct { name string diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go index df38fb8a8a..889cd82db2 100644 --- a/test/integration/auth/auth_test.go +++ b/test/integration/auth/auth_test.go @@ -36,7 +36,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/group" "k8s.io/apiserver/pkg/authentication/request/bearertoken" @@ -110,7 +109,7 @@ func timeoutPath(resource, namespace, name string) string { var aPod string = ` { "kind": "Pod", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a", "creationTimestamp": null%s @@ -128,7 +127,7 @@ var aPod string = ` var aRC string = ` { "kind": "ReplicationController", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a", "labels": { @@ -161,7 +160,7 @@ var aRC string = ` var aService string = ` { "kind": "Service", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a", "labels": { @@ -185,7 +184,7 @@ var aService string = ` var aNode string = ` { "kind": "Node", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a"%s }, @@ -199,7 +198,7 @@ func aEvent(namespace string) string { return ` { "kind": "Event", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a"%s }, @@ -216,7 +215,7 @@ func aEvent(namespace string) string { var aBinding string = ` { "kind": "Binding", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a"%s }, @@ -239,7 +238,7 @@ var emptyEndpoints string = ` var aEndpoints string = ` { "kind": "Endpoints", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "metadata": { "name": "a"%s }, @@ -264,7 +263,7 @@ var aEndpoints string = ` var deleteNow string = ` { "kind": "DeleteOptions", - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "gracePeriodSeconds": 0%s } ` diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 13f4f7c8c4..66dabcfc9e 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -30,7 +30,6 @@ import ( "github.com/golang/glog" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/authentication/authenticator" @@ -223,7 +222,7 @@ var ( ` podNamespace = ` { - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "kind": "Namespace", "metadata": { "name": "pod-namespace"%s @@ -232,7 +231,7 @@ var ( ` jobNamespace = ` { - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "kind": "Namespace", "metadata": { "name": "job-namespace"%s @@ -241,7 +240,7 @@ var ( ` forbiddenNamespace = ` { - "apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `", + "apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `", "kind": "Namespace", "metadata": { "name": "forbidden-namespace"%s @@ -506,7 +505,7 @@ func TestBootstrapping(t *testing.T) { _, s := framework.RunAMaster(masterConfig) defer s.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{BearerToken: superUser, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{BearerToken: superUser, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}) watcher, err := clientset.Rbac().ClusterRoles().Watch(api.ListOptions{ResourceVersion: "0"}) if err != nil { diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 7afc25b722..b19efcb34e 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -48,7 +47,7 @@ func TestClient(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("client", s, t) defer framework.DeleteTestingNamespace(ns, s, t) @@ -120,7 +119,7 @@ func TestAtomicPut(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("atomic-put", s, t) defer framework.DeleteTestingNamespace(ns, s, t) @@ -212,7 +211,7 @@ func TestPatch(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("patch", s, t) defer framework.DeleteTestingNamespace(ns, s, t) @@ -321,7 +320,7 @@ func TestPatchWithCreateOnUpdate(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("patch-with-create", s, t) defer framework.DeleteTestingNamespace(ns, s, t) @@ -432,7 +431,7 @@ func TestAPIVersions(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) clientVersion := c.Core().RESTClient().APIVersion().String() g, err := c.Discovery().ServerGroups() @@ -457,7 +456,7 @@ func TestSingleWatch(t *testing.T) { ns := framework.CreateTestingNamespace("single-watch", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) mkEvent := func(i int) *v1.Event { name := fmt.Sprintf("event-%v", i) @@ -542,7 +541,7 @@ func TestMultiWatch(t *testing.T) { ns := framework.CreateTestingNamespace("multi-watch", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) dummyEvent := func(i int) *v1.Event { name := fmt.Sprintf("unrelated-%v", i) @@ -798,7 +797,7 @@ func TestSelfLinkOnNamespace(t *testing.T) { ns := framework.CreateTestingNamespace("selflink", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) runSelfLinkTestOnNamespace(t, c, ns.Name) } diff --git a/test/integration/client/dynamic_client_test.go b/test/integration/client/dynamic_client_test.go index 2bf89fc130..07e1dc4a34 100644 --- a/test/integration/client/dynamic_client_test.go +++ b/test/integration/client/dynamic_client_test.go @@ -22,10 +22,10 @@ import ( "reflect" "testing" - "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" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -41,7 +41,7 @@ func TestDynamicClient(t *testing.T) { ns := framework.CreateTestingNamespace("dynamic-client", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - gv := ®istered.GroupOrDie(v1.GroupName).GroupVersion + gv := &api.Registry.GroupOrDie(v1.GroupName).GroupVersion config := &restclient.Config{ Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: gv}, diff --git a/test/integration/configmap/configmap_test.go b/test/integration/configmap/configmap_test.go index 7b71bc6ee2..ba059c3959 100644 --- a/test/integration/configmap/configmap_test.go +++ b/test/integration/configmap/configmap_test.go @@ -23,7 +23,7 @@ package configmap import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -36,7 +36,7 @@ func TestConfigMap(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("config-map", s, t) defer framework.DeleteTestingNamespace(ns, s, t) diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 539023c199..fbe923f1d6 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -51,7 +51,6 @@ go_library( "//vendor:github.com/go-openapi/spec", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", - "//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", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index d180b76344..978367b430 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -27,7 +27,6 @@ import ( "time" "github.com/golang/glog" - "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" @@ -119,7 +118,7 @@ func NewMasterComponents(c *Config) *MasterComponents { // TODO: Allow callers to pipe through a different master url and create a client/start components using it. glog.Infof("Master %+v", s.URL) // TODO: caesarxuchao: remove this client when the refactoring of client libraray is done. - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, QPS: c.QPS, Burst: c.Burst}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, QPS: c.QPS, Burst: c.Burst}) rcStopCh := make(chan struct{}) controllerManager := replicationcontroller.NewReplicationManagerFromClient(clientset, controller.NoResyncPeriodFunc, c.Burst, 4096) diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index dabbbd43de..1c7342b24c 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -30,7 +30,6 @@ import ( "github.com/golang/glog" dto "github.com/prometheus/client_model/go" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/types" @@ -141,10 +140,10 @@ func setup(t *testing.T) (*httptest.Server, *garbagecollector.GarbageCollector, } config := &restclient.Config{Host: s.URL} config.ContentConfig.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: metaonly.NewMetadataCodecFactory()} - metaOnlyClientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + metaOnlyClientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) config.ContentConfig.NegotiatedSerializer = nil - clientPool := dynamic.NewClientPool(config, registered.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) - gc, err := garbagecollector.NewGarbageCollector(metaOnlyClientPool, clientPool, registered.RESTMapper(), deletableGroupVersionResources) + clientPool := dynamic.NewClientPool(config, api.Registry.RESTMapper(), dynamic.LegacyAPIPathResolverFunc) + gc, err := garbagecollector.NewGarbageCollector(metaOnlyClientPool, clientPool, api.Registry.RESTMapper(), deletableGroupVersionResources) if err != nil { t.Fatalf("Failed to create garbage collector") } diff --git a/test/integration/master/master_test.go b/test/integration/master/master_test.go index 384d68c835..f2e974a1e1 100644 --- a/test/integration/master/master_test.go +++ b/test/integration/master/master_test.go @@ -33,7 +33,6 @@ import ( "github.com/ghodss/yaml" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api" @@ -279,7 +278,7 @@ func TestMasterService(t *testing.T) { _, s := framework.RunAMaster(framework.NewIntegrationTestMasterConfig()) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}) err := wait.Poll(time.Second, time.Minute, func() (bool, error) { svcList, err := client.Core().Services(api.NamespaceDefault).List(api.ListOptions{}) @@ -321,7 +320,7 @@ func TestServiceAlloc(t *testing.T) { _, s := framework.RunAMaster(cfg) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}) svc := func(i int) *api.Service { return &api.Service{ diff --git a/test/integration/metrics/metrics_test.go b/test/integration/metrics/metrics_test.go index 938f4257a4..305c8fb3ca 100644 --- a/test/integration/metrics/metrics_test.go +++ b/test/integration/metrics/metrics_test.go @@ -25,7 +25,7 @@ import ( "net/http/httptest" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -108,7 +108,7 @@ func TestApiserverMetrics(t *testing.T) { // Make a request to the apiserver to ensure there's at least one data point // for the metrics we're expecting -- otherwise, they won't be exported. - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) if _, err := client.Core().Pods(v1.NamespaceDefault).List(v1.ListOptions{}); err != nil { t.Fatalf("unexpected error getting pods: %v", err) } diff --git a/test/integration/objectmeta/BUILD b/test/integration/objectmeta/BUILD index 67b675bc66..14c2391feb 100644 --- a/test/integration/objectmeta/BUILD +++ b/test/integration/objectmeta/BUILD @@ -12,12 +12,12 @@ go_test( srcs = ["objectmeta_test.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/restclient:go_default_library", "//test/integration/framework:go_default_library", "//vendor:github.com/stretchr/testify/assert", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/test/integration/objectmeta/objectmeta_test.go b/test/integration/objectmeta/objectmeta_test.go index f07dce0301..c9ba5a5acb 100644 --- a/test/integration/objectmeta/objectmeta_test.go +++ b/test/integration/objectmeta/objectmeta_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -33,7 +33,7 @@ func TestIgnoreClusterName(t *testing.T) { _, s := framework.RunAMaster(config) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := v1.Namespace{ ObjectMeta: v1.ObjectMeta{ Name: "test-namespace", diff --git a/test/integration/pods/pods_test.go b/test/integration/pods/pods_test.go index 354dae200c..59b5d34981 100644 --- a/test/integration/pods/pods_test.go +++ b/test/integration/pods/pods_test.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -37,7 +37,7 @@ func TestPodUpdateActiveDeadlineSeconds(t *testing.T) { ns := framework.CreateTestingNamespace("pod-activedeadline-update", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) var ( iZero = int64(0) @@ -155,7 +155,7 @@ func TestPodReadOnlyFilesystem(t *testing.T) { ns := framework.CreateTestingNamespace("pod-readonly-root", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) pod := &v1.Pod{ ObjectMeta: v1.ObjectMeta{ diff --git a/test/integration/quota/quota_test.go b/test/integration/quota/quota_test.go index 656e700a82..9eb7205c62 100644 --- a/test/integration/quota/quota_test.go +++ b/test/integration/quota/quota_test.go @@ -25,7 +25,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" @@ -63,8 +62,8 @@ func TestQuota(t *testing.T) { defer s.Close() admissionCh := make(chan struct{}) - clientset := clientset.NewForConfigOrDie(&restclient.Config{QPS: -1, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) - internalClientset := internalclientset.NewForConfigOrDie(&restclient.Config{QPS: -1, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{QPS: -1, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) + internalClientset := internalclientset.NewForConfigOrDie(&restclient.Config{QPS: -1, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) admission, err := resourcequota.NewResourceQuota(quotainstall.NewRegistry(nil, nil), 5, admissionCh) if err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index 4db621b3b7..08ba421c21 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -196,7 +196,7 @@ func TestSchedulerExtender(t *testing.T) { ns := framework.CreateTestingNamespace("scheduler-extender", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) extender1 := &Extender{ name: "extender1", @@ -236,7 +236,7 @@ func TestSchedulerExtender(t *testing.T) { }, }, } - policy.APIVersion = registered.GroupOrDie(v1.GroupName).GroupVersion.String() + policy.APIVersion = api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() schedulerConfigFactory := factory.NewConfigFactory(clientSet, v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) schedulerConfig, err := schedulerConfigFactory.CreateFromConfig(policy) diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index 5eb7a4c889..61ae030528 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" @@ -57,7 +57,7 @@ func TestUnschedulableNodes(t *testing.T) { ns := framework.CreateTestingNamespace("unschedulable-nodes", s, t) defer framework.DeleteTestingNamespace(ns, s, t) - clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) schedulerConfigFactory := factory.NewConfigFactory(clientSet, v1.DefaultSchedulerName, v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) schedulerConfig, err := schedulerConfigFactory.Create() @@ -322,7 +322,7 @@ func TestMultiScheduler(t *testing.T) { - testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2 should NOT be scheduled */ // 1. create and start default-scheduler - clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) // NOTE: This test cannot run in parallel, because it is creating and deleting // non-namespaced objects (Nodes). @@ -397,7 +397,7 @@ func TestMultiScheduler(t *testing.T) { } // 5. create and start a scheduler with name "foo-scheduler" - clientSet2 := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientSet2 := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) schedulerConfigFactory2 := factory.NewConfigFactory(clientSet2, "foo-scheduler", v1.DefaultHardPodAffinitySymmetricWeight, v1.DefaultFailureDomains) schedulerConfig2, err := schedulerConfigFactory2.Create() @@ -487,7 +487,7 @@ func TestAllocatable(t *testing.T) { defer framework.DeleteTestingNamespace(ns, s, t) // 1. create and start default-scheduler - clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) // NOTE: This test cannot run in parallel, because it is creating and deleting // non-namespaced objects (Nodes). diff --git a/test/integration/scheduler_perf/BUILD b/test/integration/scheduler_perf/BUILD index dbf928413d..6c45316e3e 100644 --- a/test/integration/scheduler_perf/BUILD +++ b/test/integration/scheduler_perf/BUILD @@ -13,6 +13,7 @@ go_library( srcs = ["util.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", @@ -23,7 +24,6 @@ go_library( "//plugin/pkg/scheduler/factory:go_default_library", "//test/integration/framework:go_default_library", "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", ], ) diff --git a/test/integration/scheduler_perf/util.go b/test/integration/scheduler_perf/util.go index e8dc2c2d63..aed8e15f04 100644 --- a/test/integration/scheduler_perf/util.go +++ b/test/integration/scheduler_perf/util.go @@ -21,7 +21,7 @@ import ( "net/http/httptest" "github.com/golang/glog" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" @@ -52,7 +52,7 @@ func mustSetupScheduler() (schedulerConfigFactory *factory.ConfigFactory, destro clientSet := clientset.NewForConfigOrDie(&restclient.Config{ Host: s.URL, - ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, + ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, QPS: 5000.0, Burst: 5000, }) diff --git a/test/integration/secrets/secrets_test.go b/test/integration/secrets/secrets_test.go index d3d3ed1933..8a6755cc3b 100644 --- a/test/integration/secrets/secrets_test.go +++ b/test/integration/secrets/secrets_test.go @@ -23,7 +23,7 @@ package secrets import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -42,7 +42,7 @@ func TestSecrets(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("secret", s, t) defer framework.DeleteTestingNamespace(ns, s, t) diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go index 398425f326..14a6f174d2 100644 --- a/test/integration/serviceaccount/service_account_test.go +++ b/test/integration/serviceaccount/service_account_test.go @@ -31,7 +31,6 @@ import ( "testing" "time" - "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/wait" @@ -346,11 +345,11 @@ func startServiceAccountTestServer(t *testing.T) (*clientset.Clientset, restclie })) // Anonymous client config - clientConfig := restclient.Config{Host: apiServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}} + clientConfig := restclient.Config{Host: apiServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}} // Root client // TODO: remove rootClient after we refactor pkg/admission to use the clientset. - rootClientset := clientset.NewForConfigOrDie(&restclient.Config{Host: apiServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, BearerToken: rootToken}) - internalRootClientset := internalclientset.NewForConfigOrDie(&restclient.Config{Host: apiServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, BearerToken: rootToken}) + rootClientset := clientset.NewForConfigOrDie(&restclient.Config{Host: apiServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, BearerToken: rootToken}) + internalRootClientset := internalclientset.NewForConfigOrDie(&restclient.Config{Host: apiServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, BearerToken: rootToken}) // Set up two authenticators: // 1. A token authenticator that maps the rootToken to the "root" user // 2. A ServiceAccountToken authenticator that validates ServiceAccount tokens diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go index d51ac350db..533a07078f 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -23,8 +23,8 @@ package storageclasses import ( "testing" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" @@ -41,7 +41,7 @@ func TestStorageClasses(t *testing.T) { _, s := framework.RunAMaster(nil) defer s.Close() - client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}}) ns := framework.CreateTestingNamespace("storageclass", s, t) defer framework.DeleteTestingNamespace(ns, s, t) diff --git a/test/integration/volume/attach_detach_test.go b/test/integration/volume/attach_detach_test.go index a1a0570e17..89b532e693 100644 --- a/test/integration/volume/attach_detach_test.go +++ b/test/integration/volume/attach_detach_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -169,7 +169,7 @@ func waitToObservePods(t *testing.T, podInformer cache.SharedIndexInformer, podN func createAdClients(ns *v1.Namespace, t *testing.T, server *httptest.Server, syncPeriod time.Duration) (*clientset.Clientset, attachdetach.AttachDetachController, cache.SharedIndexInformer, cache.SharedIndexInformer) { config := restclient.Config{ Host: server.URL, - ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, + ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, QPS: 1000000, Burst: 1000000, } diff --git a/test/integration/volume/persistent_volumes_test.go b/test/integration/volume/persistent_volumes_test.go index d98467725d..452e844b3b 100644 --- a/test/integration/volume/persistent_volumes_test.go +++ b/test/integration/volume/persistent_volumes_test.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/apimachinery/registered" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" "k8s.io/kubernetes/pkg/api" @@ -1094,13 +1093,13 @@ func createClients(ns *v1.Namespace, t *testing.T, s *httptest.Server, syncPerio // creates many objects and default values were too low. binderClient := clientset.NewForConfigOrDie(&restclient.Config{ Host: s.URL, - ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, + ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, QPS: 1000000, Burst: 1000000, }) testClient := clientset.NewForConfigOrDie(&restclient.Config{ Host: s.URL, - ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}, + ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(v1.GroupName).GroupVersion}, QPS: 1000000, Burst: 1000000, }) diff --git a/vendor/BUILD b/vendor/BUILD index 602fc02444..fb4c570683 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -9467,6 +9467,7 @@ go_library( "//vendor:github.com/davecgh/go-spew/spew", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/client-go/pkg/api/meta", "//vendor:k8s.io/client-go/pkg/api/resource", "//vendor:k8s.io/client-go/pkg/apis/meta/v1",