diff --git a/main.go b/main.go index c8225b54f..cb829975e 100644 --- a/main.go +++ b/main.go @@ -39,9 +39,12 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" + "sigs.k8s.io/controller-runtime/pkg/metrics/server" + "sigs.k8s.io/controller-runtime/pkg/webhook" sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1" "github.com/k8snetworkplumbingwg/sriov-network-operator/controllers" @@ -103,23 +106,23 @@ func main() { namespace := os.Getenv("NAMESPACE") mgr, err := ctrl.NewManager(restConfig, ctrl.Options{ Scheme: scheme, - MetricsBindAddress: metricsAddr, - Port: 9443, + Metrics: server.Options{BindAddress: metricsAddr}, + WebhookServer: webhook.NewServer(webhook.Options{Port: 9443}), HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, LeaseDuration: &le.LeaseDuration, RenewDeadline: &le.RenewDeadline, RetryPeriod: &le.RetryPeriod, LeaderElectionID: "a56def2a.openshift.io", - Namespace: namespace, + Cache: cache.Options{DefaultNamespaces: map[string]cache.Config{namespace: {}}}, }) if err != nil { setupLog.Error(err, "unable to start manager") os.Exit(1) } mgrGlobal, err := ctrl.NewManager(restConfig, ctrl.Options{ - Scheme: scheme, - MetricsBindAddress: "0", + Scheme: scheme, + Metrics: server.Options{BindAddress: "0"}, }) if err != nil { setupLog.Error(err, "unable to start global manager")