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.

Reset DeferredDiscoveryRESTMapper before use
e225bbf1 · Solly Ross · ed273fc9 · e225bbf1 · e225bbf1
Commit e225bbf1 authored Jan 30, 2018 by Solly Ross
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

framework.go test/e2e/framework/framework.go +1 -0

load.go test/e2e/scalability/load.go +1 -0

No files found.
--- 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)


--- 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)
 	}