- fixed up the issues

appvia · Aug 25, 2023 · 40bc715 · 40bc715
1 parent c496c4e
commit 40bc715
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -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 {