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.

Author: aleskandro

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,24 +203,31 @@ 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
 	}
 
 	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
 }