github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74344 from Betula-L/fix-dynamic-informer

Browse Source 
fix dynamic informer mishandles parameter tweakListOptions
This commit is contained in:
Kubernetes Prow Robot 2019-02-27 04:33:52 -08:00 committed by GitHub
commit 601c2d8550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/client-go/dynamic/dynamicinformer/informer.go
View File

@ -45,6 +45,7 @@ func NewFilteredDynamicSharedInformerFactory(client dynamic.Interface, defaultRe
namespace: metav1.NamespaceAll, namespace: metav1.NamespaceAll,
informers: map[schema.GroupVersionResource]informers.GenericInformer{}, informers: map[schema.GroupVersionResource]informers.GenericInformer{},
startedInformers: make(map[schema.GroupVersionResource]bool), startedInformers: make(map[schema.GroupVersionResource]bool),
tweakListOptions: tweakListOptions,
} }
} }
@ -58,6 +59,7 @@ type dynamicSharedInformerFactory struct {
// startedInformers is used for tracking which informers have been started. // startedInformers is used for tracking which informers have been started.
// This allows Start() to be called multiple times safely. // This allows Start() to be called multiple times safely.
startedInformers map[schema.GroupVersionResource]bool startedInformers map[schema.GroupVersionResource]bool
tweakListOptions TweakListOptionsFunc
} }
var _ DynamicSharedInformerFactory = &dynamicSharedInformerFactory{} var _ DynamicSharedInformerFactory = &dynamicSharedInformerFactory{}
@ -72,7 +74,7 @@ func (f *dynamicSharedInformerFactory) ForResource(gvr schema.GroupVersionResour
return informer return informer
} }
informer = NewFilteredDynamicInformer(f.client, gvr, f.namespace, f.defaultResync, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, nil) informer = NewFilteredDynamicInformer(f.client, gvr, f.namespace, f.defaultResync, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
f.informers[key] = informer f.informers[key] = informer
return informer return informer