Merge pull request kubernetes-sigs#1703 from FillZpp/fix-internal-cache-object-selector

k8s-ci-robot · web-flow · commit c73b143dc503 · 2021-10-25T07:10:24.000-07:00
🐛 Fix the internal cache object selector
diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -86,8 +86,11 @@ type Informer interface {
 	HasSynced() bool
 }
 
+// ObjectSelector is an alias name of internal.Selector.
+type ObjectSelector internal.Selector
+
 // SelectorsByObject associate a client.Object's GVK to a field/label selector.
-type SelectorsByObject map[client.Object]internal.Selector
+type SelectorsByObject map[client.Object]ObjectSelector
 
 // Options are the optional arguments for creating a new InformersMap object.
 type Options struct {
@@ -198,7 +201,7 @@ func convertToSelectorsByGVK(selectorsByObject SelectorsByObject, scheme *runtim
 		if err != nil {
 			return nil, err
 		}
-		selectorsByGVK[gvk] = selector
+		selectorsByGVK[gvk] = internal.Selector(selector)
 	}
 	return selectorsByGVK, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,11 @@ type Informer interface {`
`86`	`86`	`HasSynced() bool`
`87`	`87`	`}`
`88`	`88`
	`89`	`+// ObjectSelector is an alias name of internal.Selector.`
	`90`	`+type ObjectSelector internal.Selector`
	`91`	`+`
`89`	`92`	`// SelectorsByObject associate a client.Object's GVK to a field/label selector.`
`90`		`-type SelectorsByObject map[client.Object]internal.Selector`
	`93`	`+type SelectorsByObject map[client.Object]ObjectSelector`
`91`	`94`
`92`	`95`	`// Options are the optional arguments for creating a new InformersMap object.`
`93`	`96`	`type Options struct {`
`@@ -198,7 +201,7 @@ func convertToSelectorsByGVK(selectorsByObject SelectorsByObject, scheme *runtim`
`198`	`201`	`if err != nil {`
`199`	`202`	`return nil, err`
`200`	`203`	`}`
`201`		`- selectorsByGVK[gvk] = selector`
	`204`	`+ selectorsByGVK[gvk] = internal.Selector(selector)`
`202`	`205`	`}`
`203`	`206`	`return selectorsByGVK, nil`
`204`	`207`	`}`