From 40bc715acec60b748d9fb5145cccac0ba58adfc8 Mon Sep 17 00:00:00 2001
From: Rohith Jayawardene <gambol99@gmail.com>
Date: Fri, 25 Aug 2023 09:44:28 +0200
Subject: [PATCH] - fixed up the issues

---
 pkg/cmd/tnctl/state/list_test.go |  4 +++-
 pkg/server/server.go             | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg/cmd/tnctl/state/list_test.go b/pkg/cmd/tnctl/state/list_test.go
index 85f305aa5..6cf3213bc 100644
--- a/pkg/cmd/tnctl/state/list_test.go
+++ b/pkg/cmd/tnctl/state/list_test.go
@@ -53,7 +53,9 @@ var _ = Describe("Listing the state", func() {
 	var err error
 
 	BeforeEach(func() {
-		cc = fake.NewFakeClientWithScheme(schema.GetScheme())
+		cc = fake.NewClientBuilder().
+			WithScheme(schema.GetScheme()).
+			Build()
 		kc = k8sfake.NewSimpleClientset()
 
 		streams, _, stdout, _ = genericclioptions.NewTestIOStreams()
diff --git a/pkg/server/server.go b/pkg/server/server.go
index c6b62d106..4240de2d1 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -30,7 +30,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	"github.com/appvia/terranetes-controller/pkg/apiserver"
@@ -118,14 +120,17 @@ func New(cfg *rest.Config, config Config) (*Server, error) {
 	}
 
 	options := manager.Options{
+		Cache: cache.Options{
+			SyncPeriod: &config.ResyncPeriod,
+		},
 		LeaderElection:                false,
 		LeaderElectionID:              "controller.terraform.appvia.io",
 		LeaderElectionNamespace:       ns,
 		LeaderElectionReleaseOnCancel: true,
-		MetricsBindAddress:            fmt.Sprintf(":%d", config.MetricsPort),
-		Port:                          config.WebhookPort,
-		Scheme:                        schema.GetScheme(),
-		SyncPeriod:                    &config.ResyncPeriod,
+		Metrics: metricsserver.Options{
+			BindAddress: fmt.Sprintf(":%d", config.MetricsPort),
+		},
+		Scheme: schema.GetScheme(),
 	}
 
 	if config.EnableWebhooks {