Fix patch to controller runtime 0.16.3

Signed-off-by: Chris Doherty <[email protected]>
tinkerbell · Jan 12, 2024 · 777917f · 777917f
1 parent ab129da
commit 777917f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/cmd/tink-controller/main.go b/cmd/tink-controller/main.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 // version is set at build time.
@@ -88,8 +89,10 @@ func NewRootCommand() *cobra.Command {
 				LeaderElection:          config.EnableLeaderElection,
 				LeaderElectionID:        "tink.tinkerbell.org",
 				LeaderElectionNamespace: namespace,
-				MetricsBindAddress:      config.MetricsAddr,
-				HealthProbeBindAddress:  config.ProbeAddr,
+				Metrics: server.Options{
+					BindAddress: config.MetricsAddr,
+				},
+				HealthProbeBindAddress: config.ProbeAddr,
 			}
 
 			mgr, err := controller.NewManager(cfg, options)

diff --git a/internal/server/kubernetes_api.go b/internal/server/kubernetes_api.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
 )
@@ -60,7 +61,9 @@ func NewKubeBackedServerFromREST(logger logr.Logger, config *rest.Config, namesp
 	clstr, err := cluster.New(config, func(opts *cluster.Options) {
 		opts.Scheme = controller.DefaultScheme()
 		opts.Logger = zapr.NewLogger(zap.NewNop())
-		opts.Cache.Namespaces = []string{namespace}
+		opts.Cache.DefaultNamespaces = map[string]cache.Config{
+			namespace: {},
+		}
 	})
 	if err != nil {
 		return nil, fmt.Errorf("init client: %w", err)