From dfd8db8ae962cadb88666713dfd053283ec10e4f Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 19 Jan 2017 09:22:09 -0500 Subject: [PATCH 1/2] allow API groups to be installed and registered in multiple schemes --- .../pkg/apis/apiregistration/install/BUILD | 3 +++ .../apis/apiregistration/install/install.go | 10 ++++++++- cmd/kubeadm/app/apis/kubeadm/install/BUILD | 3 +++ .../app/apis/kubeadm/install/install.go | 10 ++++++++- .../test_apis/testgroup/install/install.go | 2 +- federation/apis/core/install/install.go | 2 +- federation/apis/federation/install/install.go | 2 +- pkg/api/BUILD | 1 - pkg/api/install/install.go | 2 +- pkg/apimachinery/announced/BUILD | 1 - pkg/apimachinery/announced/group_factory.go | 9 ++++---- pkg/apis/apps/install/BUILD | 3 +++ pkg/apis/apps/install/install.go | 10 ++++++++- pkg/apis/authentication/install/BUILD | 3 +++ pkg/apis/authentication/install/install.go | 10 ++++++++- pkg/apis/authorization/install/BUILD | 3 +++ pkg/apis/authorization/install/install.go | 10 ++++++++- pkg/apis/autoscaling/install/BUILD | 3 +++ pkg/apis/autoscaling/install/install.go | 10 ++++++++- pkg/apis/batch/install/BUILD | 3 +++ pkg/apis/batch/install/install.go | 10 ++++++++- pkg/apis/certificates/install/BUILD | 3 +++ pkg/apis/certificates/install/install.go | 10 ++++++++- pkg/apis/componentconfig/install/BUILD | 3 +++ pkg/apis/componentconfig/install/install.go | 10 ++++++++- pkg/apis/extensions/install/BUILD | 3 +++ pkg/apis/extensions/install/install.go | 10 ++++++++- pkg/apis/imagepolicy/install/BUILD | 3 +++ pkg/apis/imagepolicy/install/install.go | 10 ++++++++- pkg/apis/policy/install/BUILD | 3 +++ pkg/apis/policy/install/install.go | 10 ++++++++- pkg/apis/rbac/install/BUILD | 3 +++ pkg/apis/rbac/install/install.go | 10 ++++++++- pkg/apis/storage/install/BUILD | 3 +++ pkg/apis/storage/install/install.go | 10 ++++++++- .../server/genericapiserver_test.go | 2 +- .../apimachinery/pkg/api/meta/default.go | 21 +++++++------------ vendor/BUILD | 1 + 38 files changed, 185 insertions(+), 40 deletions(-) rename pkg/api/mapper.go => staging/src/k8s.io/apimachinery/pkg/api/meta/default.go (65%) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD index 63246ac0f84..573efead856 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD @@ -14,7 +14,10 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", + "//pkg/api:go_default_library", "//pkg/apimachinery/announced: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/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go index ac1d7bb35de..74303218da7 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go @@ -17,13 +17,21 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: apiregistration.GroupName, @@ -35,7 +43,7 @@ func init() { announced.VersionToSchemeFunc{ v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/cmd/kubeadm/app/apis/kubeadm/install/BUILD b/cmd/kubeadm/app/apis/kubeadm/install/BUILD index 7d80e48532c..099b1309204 100644 --- a/cmd/kubeadm/app/apis/kubeadm/install/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/install/BUILD @@ -17,7 +17,10 @@ go_library( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/v1alpha1:go_default_library", + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/cmd/kubeadm/app/apis/kubeadm/install/install.go b/cmd/kubeadm/app/apis/kubeadm/install/install.go index e27b6291176..24e2042db97 100644 --- a/cmd/kubeadm/app/apis/kubeadm/install/install.go +++ b/cmd/kubeadm/app/apis/kubeadm/install/install.go @@ -17,12 +17,20 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: kubeadm.GroupName, @@ -33,7 +41,7 @@ func init() { announced.VersionToSchemeFunc{ v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } 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 36e58056997..aeb36b87827 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 @@ -85,7 +85,7 @@ func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { ignoredKinds := sets.NewString() - return api.NewDefaultRESTMapper(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped) + return api.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) } // InterfacesFor returns the default Codec and ResourceVersioner for a given version diff --git a/federation/apis/core/install/install.go b/federation/apis/core/install/install.go index ef75d2f405b..b93f383ca65 100644 --- a/federation/apis/core/install/install.go +++ b/federation/apis/core/install/install.go @@ -99,7 +99,7 @@ func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { "DeleteOptions", "Status") - mapper := api.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, core.Scheme) + mapper := meta.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, core.Scheme) // setup aliases for groups of resources mapper.AddResourceAlias("all", userResources...) diff --git a/federation/apis/federation/install/install.go b/federation/apis/federation/install/install.go index 2396cf2b545..5ce961d4d34 100644 --- a/federation/apis/federation/install/install.go +++ b/federation/apis/federation/install/install.go @@ -92,7 +92,7 @@ func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { ignoredKinds := sets.NewString() - return api.NewDefaultRESTMapper(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped) + return meta.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) } // interfacesFor returns the default Codec and ResourceVersioner for a given version diff --git a/pkg/api/BUILD b/pkg/api/BUILD index aeddc1b4e2a..a67b5f09397 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -17,7 +17,6 @@ go_library( "field_constants.go", "helpers.go", "json.go", - "mapper.go", "meta.go", "ref.go", "register.go", diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go index 9fcaa1b9984..22a698c1d5f 100644 --- a/pkg/api/install/install.go +++ b/pkg/api/install/install.go @@ -109,7 +109,7 @@ func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { "ThirdPartyResourceData", "ThirdPartyResourceList") - mapper := api.NewDefaultRESTMapper(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped) + mapper := meta.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) return mapper } diff --git a/pkg/apimachinery/announced/BUILD b/pkg/apimachinery/announced/BUILD index b838c73124b..ddd04523fdc 100644 --- a/pkg/apimachinery/announced/BUILD +++ b/pkg/apimachinery/announced/BUILD @@ -16,7 +16,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apimachinery", diff --git a/pkg/apimachinery/announced/group_factory.go b/pkg/apimachinery/announced/group_factory.go index 400f1c132cb..8a14908e28d 100644 --- a/pkg/apimachinery/announced/group_factory.go +++ b/pkg/apimachinery/announced/group_factory.go @@ -27,7 +27,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/api" ) type SchemeFunc func(*runtime.Scheme) error @@ -171,7 +170,7 @@ func (gmf *GroupMetaFactory) newRESTMapper(scheme *runtime.Scheme, externalVersi ignoredKinds = gmf.GroupArgs.IgnoredKinds } - return api.NewDefaultRESTMapperFromScheme( + return meta.NewDefaultRESTMapperFromScheme( externalVersions, groupMeta.InterfacesFor, gmf.GroupArgs.ImportPrefix, @@ -235,11 +234,11 @@ func (gmf *GroupMetaFactory) Enable(m *registered.APIRegistrationManager, scheme // RegisterAndEnable is provided only to allow this code to get added in multiple steps. // 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(api.Registry); err != nil { +func (gmf *GroupMetaFactory) RegisterAndEnable(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) error { + if err := gmf.Register(registry); err != nil { return err } - if err := gmf.Enable(api.Registry, api.Scheme); err != nil { + if err := gmf.Enable(registry, scheme); err != nil { return err } diff --git a/pkg/apis/apps/install/BUILD b/pkg/apis/apps/install/BUILD index 29069efb8b4..0831fde4cf5 100644 --- a/pkg/apis/apps/install/BUILD +++ b/pkg/apis/apps/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/apis/apps/install/install.go b/pkg/apis/apps/install/install.go index 9b89e3bbd03..680c15d40e5 100644 --- a/pkg/apis/apps/install/install.go +++ b/pkg/apis/apps/install/install.go @@ -19,12 +19,20 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: apps.GroupName, @@ -35,7 +43,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/authentication/install/BUILD b/pkg/apis/authentication/install/BUILD index 9613ef53085..07693ba8602 100644 --- a/pkg/apis/authentication/install/BUILD +++ b/pkg/apis/authentication/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1: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/pkg/apis/authentication/install/install.go b/pkg/apis/authentication/install/install.go index d009dcdaae3..8e31ea1c91b 100644 --- a/pkg/apis/authentication/install/install.go +++ b/pkg/apis/authentication/install/install.go @@ -19,13 +19,21 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: authentication.GroupName, @@ -37,7 +45,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/authorization/install/BUILD b/pkg/apis/authorization/install/BUILD index e0b27ccd011..ee557343d13 100644 --- a/pkg/apis/authorization/install/BUILD +++ b/pkg/apis/authorization/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1: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/pkg/apis/authorization/install/install.go b/pkg/apis/authorization/install/install.go index a26fa36eadf..95082ec0701 100644 --- a/pkg/apis/authorization/install/install.go +++ b/pkg/apis/authorization/install/install.go @@ -19,13 +19,21 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/authorization" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: authorization.GroupName, @@ -37,7 +45,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/autoscaling/install/BUILD b/pkg/apis/autoscaling/install/BUILD index 919fe82d220..6fa5238b98b 100644 --- a/pkg/apis/autoscaling/install/BUILD +++ b/pkg/apis/autoscaling/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/apis/autoscaling/install/install.go b/pkg/apis/autoscaling/install/install.go index 5d498baa547..8e4e3e97892 100644 --- a/pkg/apis/autoscaling/install/install.go +++ b/pkg/apis/autoscaling/install/install.go @@ -19,12 +19,20 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/v1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: autoscaling.GroupName, @@ -35,7 +43,7 @@ func init() { announced.VersionToSchemeFunc{ v1.SchemeGroupVersion.Version: v1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/batch/install/BUILD b/pkg/apis/batch/install/BUILD index 553b59e767a..626965ca6d7 100644 --- a/pkg/apis/batch/install/BUILD +++ b/pkg/apis/batch/install/BUILD @@ -12,10 +12,13 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/apis/batch/install/install.go b/pkg/apis/batch/install/install.go index d10932cefb7..cbfde511712 100644 --- a/pkg/apis/batch/install/install.go +++ b/pkg/apis/batch/install/install.go @@ -19,6 +19,9 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/v1" @@ -26,6 +29,11 @@ import ( ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: batch.GroupName, @@ -37,7 +45,7 @@ func init() { v1.SchemeGroupVersion.Version: v1.AddToScheme, v2alpha1.SchemeGroupVersion.Version: v2alpha1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/certificates/install/BUILD b/pkg/apis/certificates/install/BUILD index 8972a462a82..953700b06f5 100644 --- a/pkg/apis/certificates/install/BUILD +++ b/pkg/apis/certificates/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1beta1: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/pkg/apis/certificates/install/install.go b/pkg/apis/certificates/install/install.go index f7da892560b..e4164db506d 100644 --- a/pkg/apis/certificates/install/install.go +++ b/pkg/apis/certificates/install/install.go @@ -19,13 +19,21 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: certificates.GroupName, @@ -37,7 +45,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/componentconfig/install/BUILD b/pkg/apis/componentconfig/install/BUILD index 71d531cc006..8ea5baa3d3f 100644 --- a/pkg/apis/componentconfig/install/BUILD +++ b/pkg/apis/componentconfig/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/apis/componentconfig/install/install.go b/pkg/apis/componentconfig/install/install.go index 9bd194165bc..cbe02e4dce9 100644 --- a/pkg/apis/componentconfig/install/install.go +++ b/pkg/apis/componentconfig/install/install.go @@ -19,12 +19,20 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: componentconfig.GroupName, @@ -35,7 +43,7 @@ func init() { announced.VersionToSchemeFunc{ v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/extensions/install/BUILD b/pkg/apis/extensions/install/BUILD index d544b7bf6ba..b81a61082e2 100644 --- a/pkg/apis/extensions/install/BUILD +++ b/pkg/apis/extensions/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1: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/pkg/apis/extensions/install/install.go b/pkg/apis/extensions/install/install.go index 2cf962e98b3..6ee747dd1e6 100644 --- a/pkg/apis/extensions/install/install.go +++ b/pkg/apis/extensions/install/install.go @@ -19,13 +19,21 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: extensions.GroupName, @@ -37,7 +45,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/imagepolicy/install/BUILD b/pkg/apis/imagepolicy/install/BUILD index 01680812d1b..e9e64e7a6fc 100644 --- a/pkg/apis/imagepolicy/install/BUILD +++ b/pkg/apis/imagepolicy/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/imagepolicy:go_default_library", "//pkg/apis/imagepolicy/v1alpha1: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/pkg/apis/imagepolicy/install/install.go b/pkg/apis/imagepolicy/install/install.go index 27b5a57a7d8..05c9352676a 100644 --- a/pkg/apis/imagepolicy/install/install.go +++ b/pkg/apis/imagepolicy/install/install.go @@ -19,13 +19,21 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/imagepolicy" "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: imagepolicy.GroupName, @@ -37,7 +45,7 @@ func init() { announced.VersionToSchemeFunc{ v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/policy/install/BUILD b/pkg/apis/policy/install/BUILD index 6eb561b2916..4dee7ee5e7d 100644 --- a/pkg/apis/policy/install/BUILD +++ b/pkg/apis/policy/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/apis/policy/install/install.go b/pkg/apis/policy/install/install.go index 69db365b97b..965734cba6d 100644 --- a/pkg/apis/policy/install/install.go +++ b/pkg/apis/policy/install/install.go @@ -19,12 +19,20 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: policy.GroupName, @@ -35,7 +43,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/rbac/install/BUILD b/pkg/apis/rbac/install/BUILD index 6d9ef7b0871..6bcb44a1268 100644 --- a/pkg/apis/rbac/install/BUILD +++ b/pkg/apis/rbac/install/BUILD @@ -12,10 +12,13 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/rbac/v1beta1: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/pkg/apis/rbac/install/install.go b/pkg/apis/rbac/install/install.go index 6399866a075..74d3e7b7d9b 100644 --- a/pkg/apis/rbac/install/install.go +++ b/pkg/apis/rbac/install/install.go @@ -19,7 +19,10 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" @@ -27,6 +30,11 @@ import ( ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: rbac.GroupName, @@ -39,7 +47,7 @@ func init() { v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/apis/storage/install/BUILD b/pkg/apis/storage/install/BUILD index 21aadc85217..d203057199f 100644 --- a/pkg/apis/storage/install/BUILD +++ b/pkg/apis/storage/install/BUILD @@ -12,9 +12,12 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ + "//pkg/api:go_default_library", "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1: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/pkg/apis/storage/install/install.go b/pkg/apis/storage/install/install.go index bfd3328bfee..35adfa6f21e 100644 --- a/pkg/apis/storage/install/install.go +++ b/pkg/apis/storage/install/install.go @@ -19,13 +19,21 @@ limitations under the License. package install import ( + "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage/v1beta1" ) func init() { + Install(api.Registry, api.Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ GroupName: storage.GroupName, @@ -37,7 +45,7 @@ func init() { announced.VersionToSchemeFunc{ v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, - ).Announce().RegisterAndEnable(); err != nil { + ).Announce().RegisterAndEnable(registry, scheme); err != nil { panic(err) } } diff --git a/pkg/genericapiserver/server/genericapiserver_test.go b/pkg/genericapiserver/server/genericapiserver_test.go index 6a1f38f9e3c..d5c4dd5848b 100644 --- a/pkg/genericapiserver/server/genericapiserver_test.go +++ b/pkg/genericapiserver/server/genericapiserver_test.go @@ -133,7 +133,7 @@ func TestInstallAPIGroups(t *testing.T) { }, nil } - mapper := api.NewDefaultRESTMapperFromScheme([]schema.GroupVersion{gv}, interfacesFor, "", sets.NewString(), sets.NewString(), scheme) + mapper := meta.NewDefaultRESTMapperFromScheme([]schema.GroupVersion{gv}, interfacesFor, "", sets.NewString(), sets.NewString(), scheme) groupMeta := apimachinery.GroupMeta{ GroupVersion: gv, GroupVersions: []schema.GroupVersion{gv}, diff --git a/pkg/api/mapper.go b/staging/src/k8s.io/apimachinery/pkg/api/meta/default.go similarity index 65% rename from pkg/api/mapper.go rename to staging/src/k8s.io/apimachinery/pkg/api/meta/default.go index 69334b0711e..5ea906a2a72 100644 --- a/pkg/api/mapper.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/default.go @@ -14,28 +14,21 @@ See the License for the specific language governing permissions and limitations under the License. */ -package api +package meta import ( "strings" - "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" ) -// Instantiates a DefaultRESTMapper based on types registered in api.Scheme -func NewDefaultRESTMapper(defaultGroupVersions []schema.GroupVersion, interfacesFunc meta.VersionInterfacesFunc, - importPathPrefix string, ignoredKinds, rootScoped sets.String) *meta.DefaultRESTMapper { - return NewDefaultRESTMapperFromScheme(defaultGroupVersions, interfacesFunc, importPathPrefix, ignoredKinds, rootScoped, Scheme) -} +// NewDefaultRESTMapperFromScheme instantiates a DefaultRESTMapper based on types registered in the given scheme. +func NewDefaultRESTMapperFromScheme(defaultGroupVersions []schema.GroupVersion, interfacesFunc VersionInterfacesFunc, + importPathPrefix string, ignoredKinds, rootScoped sets.String, scheme *runtime.Scheme) *DefaultRESTMapper { -// Instantiates a DefaultRESTMapper based on types registered in the given scheme. -func NewDefaultRESTMapperFromScheme(defaultGroupVersions []schema.GroupVersion, interfacesFunc meta.VersionInterfacesFunc, - importPathPrefix string, ignoredKinds, rootScoped sets.String, scheme *runtime.Scheme) *meta.DefaultRESTMapper { - - mapper := meta.NewDefaultRESTMapper(defaultGroupVersions, interfacesFunc) + mapper := NewDefaultRESTMapper(defaultGroupVersions, interfacesFunc) // enumerate all supported versions, get the kinds, and register with the mapper how to address // our resources. for _, gv := range defaultGroupVersions { @@ -47,9 +40,9 @@ func NewDefaultRESTMapperFromScheme(defaultGroupVersions []schema.GroupVersion, if !strings.Contains(oType.PkgPath(), importPathPrefix) || ignoredKinds.Has(kind) { continue } - scope := meta.RESTScopeNamespace + scope := RESTScopeNamespace if rootScoped.Has(kind) { - scope = meta.RESTScopeRoot + scope = RESTScopeRoot } mapper.Add(gvk, scope) } diff --git a/vendor/BUILD b/vendor/BUILD index 8b409b40162..e6fec936188 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -7910,6 +7910,7 @@ go_test( go_library( name = "k8s.io/apimachinery/pkg/api/meta", srcs = [ + "k8s.io/apimachinery/pkg/api/meta/default.go", "k8s.io/apimachinery/pkg/api/meta/doc.go", "k8s.io/apimachinery/pkg/api/meta/errors.go", "k8s.io/apimachinery/pkg/api/meta/firsthit_restmapper.go", From 9d3dfbf630e0553a2bb28da798cc4631e4485eb5 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 19 Jan 2017 09:23:52 -0500 Subject: [PATCH 2/2] move apimachinery/announced to apimachinery --- .../pkg/apis/apiregistration/install/BUILD | 2 +- .../apis/apiregistration/install/install.go | 2 +- cmd/kubeadm/app/apis/kubeadm/install/BUILD | 2 +- .../app/apis/kubeadm/install/install.go | 2 +- .../test_apis/testgroup/install/install.go | 2 +- pkg/BUILD | 1 - pkg/apimachinery/announced/BUILD | 48 ------------------- pkg/apis/apps/install/BUILD | 2 +- pkg/apis/apps/install/install.go | 2 +- pkg/apis/authentication/install/BUILD | 2 +- pkg/apis/authentication/install/install.go | 2 +- pkg/apis/authorization/install/BUILD | 2 +- pkg/apis/authorization/install/install.go | 2 +- pkg/apis/autoscaling/install/BUILD | 2 +- pkg/apis/autoscaling/install/install.go | 2 +- pkg/apis/batch/install/BUILD | 2 +- pkg/apis/batch/install/install.go | 2 +- pkg/apis/certificates/install/BUILD | 2 +- pkg/apis/certificates/install/install.go | 2 +- pkg/apis/componentconfig/install/BUILD | 2 +- pkg/apis/componentconfig/install/install.go | 2 +- pkg/apis/extensions/install/BUILD | 2 +- pkg/apis/extensions/install/install.go | 2 +- pkg/apis/imagepolicy/install/BUILD | 2 +- pkg/apis/imagepolicy/install/install.go | 2 +- pkg/apis/policy/install/BUILD | 2 +- pkg/apis/policy/install/install.go | 2 +- pkg/apis/rbac/install/BUILD | 2 +- pkg/apis/rbac/install/install.go | 2 +- pkg/apis/storage/install/BUILD | 2 +- pkg/apis/storage/install/install.go | 2 +- .../pkg}/apimachinery/announced/announced.go | 0 .../apimachinery/announced/announced_test.go | 0 .../apimachinery/announced/group_factory.go | 0 vendor/BUILD | 26 ++++++++++ 35 files changed, 55 insertions(+), 78 deletions(-) delete mode 100644 pkg/apimachinery/announced/BUILD rename {pkg => staging/src/k8s.io/apimachinery/pkg}/apimachinery/announced/announced.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/apimachinery/announced/announced_test.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/apimachinery/announced/group_factory.go (100%) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD index 573efead856..d7ebd07ec91 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD @@ -15,7 +15,7 @@ go_library( "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go index 74303218da7..98677e02fad 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go @@ -17,13 +17,13 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" ) func init() { diff --git a/cmd/kubeadm/app/apis/kubeadm/install/BUILD b/cmd/kubeadm/app/apis/kubeadm/install/BUILD index 099b1309204..b93bb41f40d 100644 --- a/cmd/kubeadm/app/apis/kubeadm/install/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/install/BUILD @@ -18,7 +18,7 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/v1alpha1:go_default_library", "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/cmd/kubeadm/app/apis/kubeadm/install/install.go b/cmd/kubeadm/app/apis/kubeadm/install/install.go index 24e2042db97..b01078b6cbf 100644 --- a/cmd/kubeadm/app/apis/kubeadm/install/install.go +++ b/cmd/kubeadm/app/apis/kubeadm/install/install.go @@ -17,12 +17,12 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" ) func init() { 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 aeb36b87827..01312992239 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 @@ -85,7 +85,7 @@ func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { ignoredKinds := sets.NewString() - return api.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) + return meta.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) } // InterfacesFor returns the default Codec and ResourceVersioner for a given version diff --git a/pkg/BUILD b/pkg/BUILD index 917e6bbb100..d88720daefb 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -14,7 +14,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/api:all-srcs", - "//pkg/apimachinery/announced:all-srcs", "//pkg/apimachinery/tests:all-srcs", "//pkg/apis/abac:all-srcs", "//pkg/apis/apps:all-srcs", diff --git a/pkg/apimachinery/announced/BUILD b/pkg/apimachinery/announced/BUILD deleted file mode 100644 index ddd04523fdc..00000000000 --- a/pkg/apimachinery/announced/BUILD +++ /dev/null @@ -1,48 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "announced.go", - "group_factory.go", - ], - tags = ["automanaged"], - deps = [ - "//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", - ], -) - -go_test( - name = "go_default_test", - srcs = ["announced_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/apis/apps/install/BUILD b/pkg/apis/apps/install/BUILD index 0831fde4cf5..4afc6bd70a3 100644 --- a/pkg/apis/apps/install/BUILD +++ b/pkg/apis/apps/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/apis/apps/install/install.go b/pkg/apis/apps/install/install.go index 680c15d40e5..aba3a3462f7 100644 --- a/pkg/apis/apps/install/install.go +++ b/pkg/apis/apps/install/install.go @@ -19,10 +19,10 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps/v1beta1" ) diff --git a/pkg/apis/authentication/install/BUILD b/pkg/apis/authentication/install/BUILD index 07693ba8602..3c0da47109b 100644 --- a/pkg/apis/authentication/install/BUILD +++ b/pkg/apis/authentication/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/authentication/install/install.go b/pkg/apis/authentication/install/install.go index 8e31ea1c91b..14e4cf902f2 100644 --- a/pkg/apis/authentication/install/install.go +++ b/pkg/apis/authentication/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" ) diff --git a/pkg/apis/authorization/install/BUILD b/pkg/apis/authorization/install/BUILD index ee557343d13..d3754c38418 100644 --- a/pkg/apis/authorization/install/BUILD +++ b/pkg/apis/authorization/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/authorization/install/install.go b/pkg/apis/authorization/install/install.go index 95082ec0701..c36debdd80d 100644 --- a/pkg/apis/authorization/install/install.go +++ b/pkg/apis/authorization/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/authorization" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" ) diff --git a/pkg/apis/autoscaling/install/BUILD b/pkg/apis/autoscaling/install/BUILD index 6fa5238b98b..42b2c1bf0e6 100644 --- a/pkg/apis/autoscaling/install/BUILD +++ b/pkg/apis/autoscaling/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/apis/autoscaling/install/install.go b/pkg/apis/autoscaling/install/install.go index 8e4e3e97892..fdcc4305f0c 100644 --- a/pkg/apis/autoscaling/install/install.go +++ b/pkg/apis/autoscaling/install/install.go @@ -19,10 +19,10 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/v1" ) diff --git a/pkg/apis/batch/install/BUILD b/pkg/apis/batch/install/BUILD index 626965ca6d7..a3bacba72e7 100644 --- a/pkg/apis/batch/install/BUILD +++ b/pkg/apis/batch/install/BUILD @@ -13,10 +13,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/apis/batch/install/install.go b/pkg/apis/batch/install/install.go index cbfde511712..6ddcc316cc3 100644 --- a/pkg/apis/batch/install/install.go +++ b/pkg/apis/batch/install/install.go @@ -19,10 +19,10 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" diff --git a/pkg/apis/certificates/install/BUILD b/pkg/apis/certificates/install/BUILD index 953700b06f5..1ee09b9f02e 100644 --- a/pkg/apis/certificates/install/BUILD +++ b/pkg/apis/certificates/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/certificates/install/install.go b/pkg/apis/certificates/install/install.go index e4164db506d..4a1134fa640 100644 --- a/pkg/apis/certificates/install/install.go +++ b/pkg/apis/certificates/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" ) diff --git a/pkg/apis/componentconfig/install/BUILD b/pkg/apis/componentconfig/install/BUILD index 8ea5baa3d3f..50d322f8c95 100644 --- a/pkg/apis/componentconfig/install/BUILD +++ b/pkg/apis/componentconfig/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/apis/componentconfig/install/install.go b/pkg/apis/componentconfig/install/install.go index cbe02e4dce9..94cb3794953 100644 --- a/pkg/apis/componentconfig/install/install.go +++ b/pkg/apis/componentconfig/install/install.go @@ -19,10 +19,10 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" ) diff --git a/pkg/apis/extensions/install/BUILD b/pkg/apis/extensions/install/BUILD index b81a61082e2..53b3892fbf1 100644 --- a/pkg/apis/extensions/install/BUILD +++ b/pkg/apis/extensions/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/extensions/install/install.go b/pkg/apis/extensions/install/install.go index 6ee747dd1e6..d17aa638c58 100644 --- a/pkg/apis/extensions/install/install.go +++ b/pkg/apis/extensions/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) diff --git a/pkg/apis/imagepolicy/install/BUILD b/pkg/apis/imagepolicy/install/BUILD index e9e64e7a6fc..7778bbc2327 100644 --- a/pkg/apis/imagepolicy/install/BUILD +++ b/pkg/apis/imagepolicy/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/imagepolicy:go_default_library", "//pkg/apis/imagepolicy/v1alpha1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/imagepolicy/install/install.go b/pkg/apis/imagepolicy/install/install.go index 05c9352676a..934eef2509d 100644 --- a/pkg/apis/imagepolicy/install/install.go +++ b/pkg/apis/imagepolicy/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/imagepolicy" "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" ) diff --git a/pkg/apis/policy/install/BUILD b/pkg/apis/policy/install/BUILD index 4dee7ee5e7d..6d5c3b8f637 100644 --- a/pkg/apis/policy/install/BUILD +++ b/pkg/apis/policy/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/pkg/apis/policy/install/install.go b/pkg/apis/policy/install/install.go index 965734cba6d..8bcae27a885 100644 --- a/pkg/apis/policy/install/install.go +++ b/pkg/apis/policy/install/install.go @@ -19,10 +19,10 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy/v1beta1" ) diff --git a/pkg/apis/rbac/install/BUILD b/pkg/apis/rbac/install/BUILD index 6bcb44a1268..45a8aaa23f6 100644 --- a/pkg/apis/rbac/install/BUILD +++ b/pkg/apis/rbac/install/BUILD @@ -13,10 +13,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/rbac/install/install.go b/pkg/apis/rbac/install/install.go index 74d3e7b7d9b..beaa8d249e9 100644 --- a/pkg/apis/rbac/install/install.go +++ b/pkg/apis/rbac/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" diff --git a/pkg/apis/storage/install/BUILD b/pkg/apis/storage/install/BUILD index d203057199f..45a3189cd93 100644 --- a/pkg/apis/storage/install/BUILD +++ b/pkg/apis/storage/install/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/apimachinery/announced:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", diff --git a/pkg/apis/storage/install/install.go b/pkg/apis/storage/install/install.go index 35adfa6f21e..83c314ff11c 100644 --- a/pkg/apis/storage/install/install.go +++ b/pkg/apis/storage/install/install.go @@ -19,11 +19,11 @@ limitations under the License. package install import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" "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/apimachinery/announced" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage/v1beta1" ) diff --git a/pkg/apimachinery/announced/announced.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced.go similarity index 100% rename from pkg/apimachinery/announced/announced.go rename to staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced.go diff --git a/pkg/apimachinery/announced/announced_test.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced_test.go similarity index 100% rename from pkg/apimachinery/announced/announced_test.go rename to staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/announced_test.go diff --git a/pkg/apimachinery/announced/group_factory.go b/staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/group_factory.go similarity index 100% rename from pkg/apimachinery/announced/group_factory.go rename to staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/group_factory.go diff --git a/vendor/BUILD b/vendor/BUILD index e6fec936188..787921bb552 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13657,3 +13657,29 @@ go_test( library = ":k8s.io/client-go/pkg/util/jsonpath", tags = ["automanaged"], ) + +go_test( + name = "k8s.io/apimachinery/pkg/apimachinery/announced_test", + srcs = ["k8s.io/apimachinery/pkg/apimachinery/announced/announced_test.go"], + library = ":k8s.io/apimachinery/pkg/apimachinery/announced", + tags = ["automanaged"], + deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/apimachinery/announced", + srcs = [ + "k8s.io/apimachinery/pkg/apimachinery/announced/announced.go", + "k8s.io/apimachinery/pkg/apimachinery/announced/group_factory.go", + ], + tags = ["automanaged"], + deps = [ + "//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", + ], +)