From 6536db196a13cd760b3d6f5e857706d00c9e02c2 Mon Sep 17 00:00:00 2001 From: irbekrm Date: Fri, 26 May 2023 14:31:49 +0100 Subject: [PATCH] c/r changes: c/r changes: use the new mechanism to build non-caching client Following c/r change in kubernetes-sigs/controller-runtime#2150 Signed-off-by: irbekrm --- pkg/controller/configmap.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/controller/configmap.go b/pkg/controller/configmap.go index 45cfef01..e5a69353 100644 --- a/pkg/controller/configmap.go +++ b/pkg/controller/configmap.go @@ -81,11 +81,13 @@ type configmap struct { } func AddConfigMapController(ctx context.Context, log logr.Logger, opts Options) error { - noCacheClient, err := client.NewDelegatingClient(client.NewDelegatingClientInput{ - CacheReader: opts.Manager.GetCache(), - Client: opts.Manager.GetClient(), - UncachedObjects: []client.Object{new(corev1.ConfigMap)}, - CacheUnstructured: false, + // noCacheClient is used to retrieve objects that we don't want to cache. + noCacheClient, err := client.New(opts.Manager.GetConfig(), client.Options{ + Cache: &client.CacheOptions{ + Reader: opts.Manager.GetCache(), + DisableFor: []client.Object{&corev1.ConfigMap{}}, + Unstructured: false, + }, }) if err != nil { return fmt.Errorf("failed to build non-cached client for ConfigMaps: %w", err)