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

k8s-ci-robot · web-flow · commit 601c2d85500e · 2019-02-27T04:33:52.000-08:00
fix dynamic informer mishandles parameter tweakListOptions
diff --git a/staging/src/k8s.io/client-go/dynamic/dynamicinformer/informer.go b/staging/src/k8s.io/client-go/dynamic/dynamicinformer/informer.go
@@ -45,6 +45,7 @@ func NewFilteredDynamicSharedInformerFactory(client dynamic.Interface, defaultRe
 		namespace:        metav1.NamespaceAll,
 		informers:        map[schema.GroupVersionResource]informers.GenericInformer{},
 		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.
 	// This allows Start() to be called multiple times safely.
 	startedInformers map[schema.GroupVersionResource]bool
+	tweakListOptions TweakListOptionsFunc
 }
 
 var _ DynamicSharedInformerFactory = &dynamicSharedInformerFactory{}
@@ -72,7 +74,7 @@ func (f *dynamicSharedInformerFactory) ForResource(gvr schema.GroupVersionResour
 		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
 
 	return informer

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func NewFilteredDynamicSharedInformerFactory(client dynamic.Interface, defaultRe`
`45`	`45`	`namespace: metav1.NamespaceAll,`
`46`	`46`	`informers: map[schema.GroupVersionResource]informers.GenericInformer{},`
`47`	`47`	`startedInformers: make(map[schema.GroupVersionResource]bool),`
	`48`	`+ tweakListOptions: tweakListOptions,`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`
`@@ -58,6 +59,7 @@ type dynamicSharedInformerFactory struct {`
`58`	`59`	`// startedInformers is used for tracking which informers have been started.`
`59`	`60`	`// This allows Start() to be called multiple times safely.`
`60`	`61`	`startedInformers map[schema.GroupVersionResource]bool`
	`62`	`+ tweakListOptions TweakListOptionsFunc`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`var _ DynamicSharedInformerFactory = &dynamicSharedInformerFactory{}`
`@@ -72,7 +74,7 @@ func (f *dynamicSharedInformerFactory) ForResource(gvr schema.GroupVersionResour`
`72`	`74`	`return informer`
`73`	`75`	`}`
`74`	`76`
`75`		`- informer = NewFilteredDynamicInformer(f.client, gvr, f.namespace, f.defaultResync, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, nil)`
	`77`	`+ informer = NewFilteredDynamicInformer(f.client, gvr, f.namespace, f.defaultResync, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)`
`76`	`78`	`f.informers[key] = informer`
`77`	`79`
`78`	`80`	`return informer`