From c1bf01a75abcb969623a31d9c1e6d73c6188b80e Mon Sep 17 00:00:00 2001 From: Anik Bhattacharjee Date: Mon, 7 Oct 2024 21:53:01 +0530 Subject: [PATCH] main.go: improved cache configuration for watching pull secret Signed-off-by: Joe Lanford --- cmd/manager/main.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index f534e13..8f6b170 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -169,16 +169,18 @@ func main() { }, }) - cacheOptions := crcache.Options{} + cacheOptions := crcache.Options{ + ByObject: map[client.Object]crcache.ByObject{}, + } if globalPullSecretKey != nil { - cacheOptions = crcache.Options{ - ByObject: map[client.Object]crcache.ByObject{ - &corev1.Secret{}: {Field: fields.SelectorFromSet(map[string]string{ - "metadata.name": globalPullSecretKey.Name, - })}, - }, - DefaultNamespaces: map[string]crcache.Config{ - globalPullSecretKey.Namespace: {LabelSelector: k8slabels.Everything()}, + cacheOptions.ByObject[&corev1.Secret{}] = crcache.ByObject{ + Namespaces: map[string]crcache.Config{ + globalPullSecretKey.Namespace: { + LabelSelector: k8slabels.Everything(), + FieldSelector: fields.SelectorFromSet(map[string]string{ + "metadata.name": globalPullSecretKey.Name, + }), + }, }, } }