From f73cc362329b6ec39087aba1b83a6e25575b5b95 Mon Sep 17 00:00:00 2001 From: Erik Godding Boye Date: Fri, 26 May 2023 20:06:28 +0200 Subject: [PATCH] fix bootstrap --- internal/operator/operator.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/operator/operator.go b/internal/operator/operator.go index 160a92f5c..32c7e01be 100644 --- a/internal/operator/operator.go +++ b/internal/operator/operator.go @@ -13,13 +13,16 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" eventsv1 "k8s.io/api/events/v1" + "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" 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/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/healthz" @@ -112,18 +115,17 @@ func (o Operator) Start(cfg config.Config) error { Unstructured: true, DisableFor: []client.Object{&eventsv1.Event{}}, }}, - Scheme: scheme, + Scheme: scheme, + MapperProvider: func(c *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) { + return apiutil.NewDiscoveryRESTMapper(c, httpClient) + }, + Cache: cache.Options{Namespaces: cfg.ScanNamespaces}, MetricsBindAddress: metricsAddr, - Port: 9443, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, LeaderElectionID: "398aa7bc.statnett.no", } - if len(cfg.ScanNamespaces) > 0 { - options.NewCache = cache.MultiNamespacedCacheBuilder(cfg.ScanNamespaces) - } - kubeConfig := ctrl.GetConfigOrDie() mgr, err := ctrl.NewManager(kubeConfig, options)