Merge pull request #2287 from k8s-infra-cherrypick-robot/cherry-pick-2252-to-release-0.14

k8s-ci-robot · web-flow · commit fb3c6fd7534d · 2023-04-24T06:11:02.000-07:00
[release-0.14] 🐛 fix a bug in multinamespaced cache implementation
diff --git a/pkg/cache/multi_namespace_cache.go b/pkg/cache/multi_namespace_cache.go
@@ -185,7 +185,7 @@ func (c *multiNamespaceCache) WaitForCacheSync(ctx context.Context) bool {
 func (c *multiNamespaceCache) IndexField(ctx context.Context, obj client.Object, field string, extractValue client.IndexerFunc) error {
 	isNamespaced, err := objectutil.IsAPINamespaced(obj, c.Scheme, c.RESTMapper)
 	if err != nil {
-		return nil //nolint:nilerr
+		return err
 	}
 
 	if !isNamespaced {

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func (c *multiNamespaceCache) WaitForCacheSync(ctx context.Context) bool {`
`185`	`185`	`func (c *multiNamespaceCache) IndexField(ctx context.Context, obj client.Object, field string, extractValue client.IndexerFunc) error {`
`186`	`186`	`isNamespaced, err := objectutil.IsAPINamespaced(obj, c.Scheme, c.RESTMapper)`
`187`	`187`	`if err != nil {`
`188`		`- return nil //nolint:nilerr`
	`188`	`+ return err`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if !isNamespaced {`