From e225bbf1a37e726e3d476efe15904a3aef310efe Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Tue, 30 Jan 2018 11:50:47 -0500 Subject: [PATCH] Reset DeferredDiscoveryRESTMapper before use DeferredDiscoveryRESTMapper won't automatically `Reset` itself before its initial use, since actually trying to construct the delegate will error out before it gets a chance to `Reset` itself. Ergo, we have to manually call `Reset` before use. --- test/e2e/framework/framework.go | 1 + test/e2e/scalability/load.go | 1 + 2 files changed, 2 insertions(+) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 821cc69087..c81442154f 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -183,6 +183,7 @@ func (f *Framework) BeforeEach() { Expect(err).NotTo(HaveOccurred()) cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoClient) restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoClient, meta.InterfacesForUnstructured) + restMapper.Reset() resolver := scaleclient.NewDiscoveryScaleKindResolver(cachedDiscoClient) f.ScalesGetter = scaleclient.New(restClient, restMapper, dynamic.LegacyAPIPathResolverFunc, resolver) diff --git a/test/e2e/scalability/load.go b/test/e2e/scalability/load.go index 6e15dbc880..9bb6f311df 100644 --- a/test/e2e/scalability/load.go +++ b/test/e2e/scalability/load.go @@ -384,6 +384,7 @@ func createClients(numberOfClients int) ([]clientset.Interface, []internalclient } cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoClient) restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoClient, meta.InterfacesForUnstructured) + restMapper.Reset() resolver := scaleclient.NewDiscoveryScaleKindResolver(cachedDiscoClient) scalesClients[i] = scaleclient.New(restClient, restMapper, dynamic.LegacyAPIPathResolverFunc, resolver) }