remove versioning interface
Kubernetes-commit: e2fc5cf259463f896213afdef15d58ef9a91eb35
This commit is contained in:
parent
6b5caebfc6
commit
0d65d340ea
|
|
@ -130,33 +130,6 @@ func init() {
|
||||||
examplev1.AddToScheme(scheme)
|
examplev1.AddToScheme(scheme)
|
||||||
}
|
}
|
||||||
|
|
||||||
func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error) {
|
|
||||||
switch version {
|
|
||||||
case testGroupVersion:
|
|
||||||
return &meta.VersionInterfaces{
|
|
||||||
ObjectConvertor: scheme,
|
|
||||||
}, nil
|
|
||||||
case newGroupVersion:
|
|
||||||
return &meta.VersionInterfaces{
|
|
||||||
ObjectConvertor: scheme,
|
|
||||||
}, nil
|
|
||||||
case grouplessGroupVersion:
|
|
||||||
return &meta.VersionInterfaces{
|
|
||||||
ObjectConvertor: scheme,
|
|
||||||
}, nil
|
|
||||||
case testGroup2Version:
|
|
||||||
return &meta.VersionInterfaces{
|
|
||||||
ObjectConvertor: scheme,
|
|
||||||
}, nil
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, groupVersions)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newMapper() *meta.DefaultRESTMapper {
|
|
||||||
return meta.NewDefaultRESTMapper([]schema.GroupVersion{testGroupVersion, newGroupVersion}, interfacesFor)
|
|
||||||
}
|
|
||||||
|
|
||||||
func addGrouplessTypes() {
|
func addGrouplessTypes() {
|
||||||
scheme.AddKnownTypes(grouplessGroupVersion,
|
scheme.AddKnownTypes(grouplessGroupVersion,
|
||||||
&genericapitesting.Simple{}, &genericapitesting.SimpleList{}, &metav1.ListOptions{}, &metav1.ExportOptions{},
|
&genericapitesting.Simple{}, &genericapitesting.SimpleList{}, &metav1.ListOptions{}, &metav1.ExportOptions{},
|
||||||
|
|
|
||||||
|
|
@ -153,20 +153,13 @@ func TestInstallAPIGroups(t *testing.T) {
|
||||||
scheme.AddKnownTypes(v1GroupVersion, &metav1.Status{})
|
scheme.AddKnownTypes(v1GroupVersion, &metav1.Status{})
|
||||||
metav1.AddToGroupVersion(scheme, v1GroupVersion)
|
metav1.AddToGroupVersion(scheme, v1GroupVersion)
|
||||||
|
|
||||||
interfacesFor := func(version schema.GroupVersion) (*meta.VersionInterfaces, error) {
|
mapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv})
|
||||||
return &meta.VersionInterfaces{
|
|
||||||
ObjectConvertor: scheme,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
mapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}, interfacesFor)
|
|
||||||
for kind := range scheme.KnownTypes(gv) {
|
for kind := range scheme.KnownTypes(gv) {
|
||||||
mapper.Add(gv.WithKind(kind), meta.RESTScopeNamespace)
|
mapper.Add(gv.WithKind(kind), meta.RESTScopeNamespace)
|
||||||
}
|
}
|
||||||
groupMeta := apimachinery.GroupMeta{
|
groupMeta := apimachinery.GroupMeta{
|
||||||
GroupVersions: []schema.GroupVersion{gv},
|
GroupVersions: []schema.GroupVersion{gv},
|
||||||
RESTMapper: mapper,
|
RESTMapper: mapper,
|
||||||
InterfacesFor: interfacesFor,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return APIGroupInfo{
|
return APIGroupInfo{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue