From 5ac4802a22cbc24593435e75d74148e8ccb043c4 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 23 Apr 2018 10:23:01 -0400 Subject: [PATCH] remove confusing flexibility for metadata interpretation Kubernetes-commit: 0710f72c65ad23e7a3726b345898ef4aaaac26fa --- pkg/endpoints/apiserver_test.go | 12 ++++-------- pkg/server/genericapiserver_test.go | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go index 9b8378800..f8fc6c838 100644 --- a/pkg/endpoints/apiserver_test.go +++ b/pkg/endpoints/apiserver_test.go @@ -146,23 +146,19 @@ func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error) switch version { case testGroupVersion: return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - MetadataAccessor: accessor, + ObjectConvertor: scheme, }, nil case newGroupVersion: return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - MetadataAccessor: accessor, + ObjectConvertor: scheme, }, nil case grouplessGroupVersion: return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - MetadataAccessor: accessor, + ObjectConvertor: scheme, }, nil case testGroup2Version: return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - MetadataAccessor: accessor, + ObjectConvertor: scheme, }, nil default: return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, groupVersions) diff --git a/pkg/server/genericapiserver_test.go b/pkg/server/genericapiserver_test.go index 0bb94f09b..c753c7048 100644 --- a/pkg/server/genericapiserver_test.go +++ b/pkg/server/genericapiserver_test.go @@ -155,8 +155,7 @@ func TestInstallAPIGroups(t *testing.T) { interfacesFor := func(version schema.GroupVersion) (*meta.VersionInterfaces, error) { return &meta.VersionInterfaces{ - ObjectConvertor: scheme, - MetadataAccessor: meta.NewAccessor(), + ObjectConvertor: scheme, }, nil }