From e23d0f3cf469c0337d15f8a0b04753499a2c4329 Mon Sep 17 00:00:00 2001
From: aleskandro <aleskandro@redhat.com>
Date: Thu, 1 Jun 2023 14:07:49 +0200
Subject: [PATCH] Fix the creation of the cachedClient for the
 openshift-config-managed namespace

kubernetes-sigs/controller-runtime#2150 deprecated the DelegatedClient and added
the CacheOption to the client.Options struct.
This commit sync the newConfigManagedClient method with that deprecation.
---
 cmd/manager/main.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 40b1871e6..c5d41ef72 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -34,9 +34,9 @@ import (
 	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
-	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -203,11 +203,13 @@ func main() {
 // namespace.
 func newConfigManagedClient(mgr manager.Manager) (runtimeclient.Client, manager.Runnable, error) {
 	cacheOpts := cache.Options{
-		Scheme:    mgr.GetScheme(),
-		Mapper:    mgr.GetRESTMapper(),
-		Namespace: awsclient.KubeCloudConfigNamespace,
+		Scheme: mgr.GetScheme(),
+		Mapper: mgr.GetRESTMapper(),
+		Namespaces: []string{
+			awsclient.KubeCloudConfigNamespace,
+		},
 	}
-	cache, err := cache.New(mgr.GetConfig(), cacheOpts)
+	cacheReader, err := cache.New(mgr.GetConfig(), cacheOpts)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -215,12 +217,17 @@ func newConfigManagedClient(mgr manager.Manager) (runtimeclient.Client, manager.
 	clientOpts := runtimeclient.Options{
 		Scheme: mgr.GetScheme(),
 		Mapper: mgr.GetRESTMapper(),
+		Cache: &client.CacheOptions{
+			Reader:       cacheReader,
+			DisableFor:   nil,
+			Unstructured: false,
+		},
 	}
 
-	cachedClient, err := cluster.DefaultNewClient(cache, config.GetConfigOrDie(), clientOpts)
+	cachedClient, err := client.New(config.GetConfigOrDie(), clientOpts)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	return cachedClient, cache, nil
+	return cachedClient, cacheReader, nil
 }