remove confusing flexibility for metadata interpretation
Kubernetes-commit: 0710f72c65ad23e7a3726b345898ef4aaaac26fa
This commit is contained in:
parent
0406d0522d
commit
5ac4802a22
|
|
@ -146,23 +146,19 @@ func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error)
|
||||||
switch version {
|
switch version {
|
||||||
case testGroupVersion:
|
case testGroupVersion:
|
||||||
return &meta.VersionInterfaces{
|
return &meta.VersionInterfaces{
|
||||||
ObjectConvertor: scheme,
|
ObjectConvertor: scheme,
|
||||||
MetadataAccessor: accessor,
|
|
||||||
}, nil
|
}, nil
|
||||||
case newGroupVersion:
|
case newGroupVersion:
|
||||||
return &meta.VersionInterfaces{
|
return &meta.VersionInterfaces{
|
||||||
ObjectConvertor: scheme,
|
ObjectConvertor: scheme,
|
||||||
MetadataAccessor: accessor,
|
|
||||||
}, nil
|
}, nil
|
||||||
case grouplessGroupVersion:
|
case grouplessGroupVersion:
|
||||||
return &meta.VersionInterfaces{
|
return &meta.VersionInterfaces{
|
||||||
ObjectConvertor: scheme,
|
ObjectConvertor: scheme,
|
||||||
MetadataAccessor: accessor,
|
|
||||||
}, nil
|
}, nil
|
||||||
case testGroup2Version:
|
case testGroup2Version:
|
||||||
return &meta.VersionInterfaces{
|
return &meta.VersionInterfaces{
|
||||||
ObjectConvertor: scheme,
|
ObjectConvertor: scheme,
|
||||||
MetadataAccessor: accessor,
|
|
||||||
}, nil
|
}, nil
|
||||||
default:
|
default:
|
||||||
return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, groupVersions)
|
return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, groupVersions)
|
||||||
|
|
|
||||||
|
|
@ -155,8 +155,7 @@ func TestInstallAPIGroups(t *testing.T) {
|
||||||
|
|
||||||
interfacesFor := func(version schema.GroupVersion) (*meta.VersionInterfaces, error) {
|
interfacesFor := func(version schema.GroupVersion) (*meta.VersionInterfaces, error) {
|
||||||
return &meta.VersionInterfaces{
|
return &meta.VersionInterfaces{
|
||||||
ObjectConvertor: scheme,
|
ObjectConvertor: scheme,
|
||||||
MetadataAccessor: meta.NewAccessor(),
|
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue