Skip to content

K
k3s
Unverified Commit 25173455 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #59053 from DirectXMan12/bug/e2e-deferred-disco-reset

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. 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. Fixes #59043 ```release-note NONE ```
parents c244994a e225bbf1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
test/e2e/framework/framework.go
View file @ 25173455
...@@ -183,6 +183,7 @@ func (f *Framework) BeforeEach() { ...@@ -183,6 +183,7 @@ func (f *Framework) BeforeEach() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoClient) cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoClient)
restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoClient, meta.InterfacesForUnstructured) restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoClient, meta.InterfacesForUnstructured)
restMapper.Reset()
resolver := scaleclient.NewDiscoveryScaleKindResolver(cachedDiscoClient) resolver := scaleclient.NewDiscoveryScaleKindResolver(cachedDiscoClient)
f.ScalesGetter = scaleclient.New(restClient, restMapper, dynamic.LegacyAPIPathResolverFunc, resolver) f.ScalesGetter = scaleclient.New(restClient, restMapper, dynamic.LegacyAPIPathResolverFunc, resolver)
......
test/e2e/scalability/load.go
View file @ 25173455
...@@ -384,6 +384,7 @@ func createClients(numberOfClients int) ([]clientset.Interface, []internalclient ...@@ -384,6 +384,7 @@ func createClients(numberOfClients int) ([]clientset.Interface, []internalclient
} }
cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoClient) cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoClient)
restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoClient, meta.InterfacesForUnstructured) restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoClient, meta.InterfacesForUnstructured)
restMapper.Reset()
resolver := scaleclient.NewDiscoveryScaleKindResolver(cachedDiscoClient) resolver := scaleclient.NewDiscoveryScaleKindResolver(cachedDiscoClient)
scalesClients[i] = scaleclient.New(restClient, restMapper, dynamic.LegacyAPIPathResolverFunc, resolver) scalesClients[i] = scaleclient.New(restClient, restMapper, dynamic.LegacyAPIPathResolverFunc, resolver)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment