kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apimachinery: remove pre-apigroups import prefix logic 

Kubernetes-commit: 8728576236698083f619c4fab06943b174f3fc61
This commit is contained in:
Dr. Stefan Schimanski 2017-08-03 17:49:35 +02:00 committed by Kubernetes Publisher
parent 521652b00c
commit 2c8f1ce1d5
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/apiserver/install/install.go
View File

@ -32,7 +32,6 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
GroupName: apiserver.GroupName, GroupName: apiserver.GroupName,
RootScopedKinds: sets.NewString("APIService"), RootScopedKinds: sets.NewString("APIService"),
VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/apiserver/pkg/apis/apiserver",
AddInternalObjectsToScheme: apiserver.AddToScheme, AddInternalObjectsToScheme: apiserver.AddToScheme,
}, },
announced.VersionToSchemeFunc{ announced.VersionToSchemeFunc{

1
pkg/apis/audit/install/install.go
View File

@ -33,7 +33,6 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
&announced.GroupMetaFactoryArgs{ &announced.GroupMetaFactoryArgs{
GroupName: audit.GroupName, GroupName: audit.GroupName,
VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/apiserver/pkg/apis/audit",
// Any Kind that is not namespaced must be cluster scoped. // Any Kind that is not namespaced must be cluster scoped.
RootScopedKinds: sets.NewString("Event", "Policy"), RootScopedKinds: sets.NewString("Event", "Policy"),
AddInternalObjectsToScheme: audit.AddToScheme, AddInternalObjectsToScheme: audit.AddToScheme,

1
pkg/apis/example/install/install.go
View File

@ -32,7 +32,6 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
&announced.GroupMetaFactoryArgs{ &announced.GroupMetaFactoryArgs{
GroupName: example.GroupName, GroupName: example.GroupName,
VersionPreferenceOrder: []string{examplev1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{examplev1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/apiserver/pkg/apis/example",
AddInternalObjectsToScheme: example.AddToScheme, AddInternalObjectsToScheme: example.AddToScheme,
}, },
announced.VersionToSchemeFunc{ announced.VersionToSchemeFunc{

2
pkg/server/genericapiserver_test.go
View File

@ -167,7 +167,7 @@ func TestInstallAPIGroups(t *testing.T) {
}, nil }, nil
} }
mapper := meta.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{ groupMeta := apimachinery.GroupMeta{
GroupVersion: gv, GroupVersion: gv,
GroupVersions: []schema.GroupVersion{gv}, GroupVersions: []schema.GroupVersion{gv},