From 9d874dd3e94002f0bd6d157dd5a8ffd117fe5814 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 28 Aug 2025 13:29:12 +0200 Subject: [PATCH] Use mcmanager.Options Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- alias.go | 3 +-- examples/cluster-api/main.go | 2 +- examples/cluster-inventory-api/main.go | 3 +-- examples/kind/main.go | 3 +-- examples/kubeconfig/main.go | 3 +-- examples/namespace/main.go | 3 +-- pkg/manager/manager.go | 2 +- providers/cluster-inventory-api/provider_test.go | 3 +-- providers/namespace/provider_test.go | 3 +-- 9 files changed, 9 insertions(+), 16 deletions(-) diff --git a/alias.go b/alias.go index 8f0648f..20c76f3 100644 --- a/alias.go +++ b/alias.go @@ -24,7 +24,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/scheme" @@ -50,7 +49,7 @@ type Result = reconcile.Result type Manager = mcmanager.Manager // Options are the arguments for creating a new Manager. -type Options = manager.Options +type Options = mcmanager.Options // SchemeBuilder builds a new Scheme for mapping go types to Kubernetes GroupVersionKinds. type SchemeBuilder = scheme.Builder diff --git a/examples/cluster-api/main.go b/examples/cluster-api/main.go index 71df954..f72920b 100644 --- a/examples/cluster-api/main.go +++ b/examples/cluster-api/main.go @@ -81,7 +81,7 @@ func main() { // Create a multi-cluster manager attached to the provider. entryLog.Info("Setting up local manager") - mcMgr, err := mcmanager.New(cfg, provider, manager.Options{ + mcMgr, err := mcmanager.New(cfg, provider, mcmanager.Options{ LeaderElection: false, // TODO(sttts): how to sync that with the upper manager? Metrics: metricsserver.Options{ BindAddress: "0", // only one can listen diff --git a/examples/cluster-inventory-api/main.go b/examples/cluster-inventory-api/main.go index 5755f4c..6720dfb 100644 --- a/examples/cluster-inventory-api/main.go +++ b/examples/cluster-inventory-api/main.go @@ -33,7 +33,6 @@ import ( ctrl "sigs.k8s.io/controller-runtime" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -92,7 +91,7 @@ func main() { // Create a multi-cluster manager attached to the provider. entryLog.Info("Setting up manager") - mcMgr, err := mcmanager.New(cfg, provider, manager.Options{ + mcMgr, err := mcmanager.New(cfg, provider, mcmanager.Options{ LeaderElection: false, Metrics: metricsserver.Options{ BindAddress: "0", // only one can listen diff --git a/examples/kind/main.go b/examples/kind/main.go index c532483..e51cb47 100644 --- a/examples/kind/main.go +++ b/examples/kind/main.go @@ -29,7 +29,6 @@ import ( ctrl "sigs.k8s.io/controller-runtime" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -45,7 +44,7 @@ func main() { ctx := signals.SetupSignalHandler() provider := kind.New() - mgr, err := mcmanager.New(ctrl.GetConfigOrDie(), provider, manager.Options{}) + mgr, err := mcmanager.New(ctrl.GetConfigOrDie(), provider, mcmanager.Options{}) if err != nil { entryLog.Error(err, "unable to create manager") os.Exit(1) diff --git a/examples/kubeconfig/main.go b/examples/kubeconfig/main.go index 4395aae..33b1d98 100644 --- a/examples/kubeconfig/main.go +++ b/examples/kubeconfig/main.go @@ -28,7 +28,6 @@ import ( ctrl "sigs.k8s.io/controller-runtime" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "sigs.k8s.io/controller-runtime/pkg/manager" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -70,7 +69,7 @@ func main() { provider := kubeconfigprovider.New(providerOpts) // Setup a cluster-aware Manager, with the provider to lookup clusters. - managerOpts := manager.Options{ + managerOpts := mcmanager.Options{ Metrics: metricsserver.Options{ BindAddress: "0", // Disable metrics server }, diff --git a/examples/namespace/main.go b/examples/namespace/main.go index cc6458b..bb033cf 100644 --- a/examples/namespace/main.go +++ b/examples/namespace/main.go @@ -40,7 +40,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -117,7 +116,7 @@ func run(ctx context.Context, log logr.Logger, kubeconfig string) error { // Setup a cluster-aware Manager, with the provider to lookup clusters. log.Info("Setting up cluster-aware manager") - mgr, err := mcmanager.New(cfg, provider, manager.Options{}) + mgr, err := mcmanager.New(cfg, provider, mcmanager.Options{}) if err != nil { return fmt.Errorf("unable to set up overall controller manager: %w", err) } diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index 7e4abe1..b79663e 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -134,7 +134,7 @@ type mcManager struct { // New returns a new Manager for creating Controllers. The provider is used to // discover and manage clusters. With a provider set to nil, the manager will // behave like a regular controller-runtime manager. -func New(config *rest.Config, provider multicluster.Provider, opts manager.Options) (Manager, error) { +func New(config *rest.Config, provider multicluster.Provider, opts Options) (Manager, error) { mgr, err := manager.New(config, opts) if err != nil { return nil, err diff --git a/providers/cluster-inventory-api/provider_test.go b/providers/cluster-inventory-api/provider_test.go index f2b4fc6..b130c3f 100644 --- a/providers/cluster-inventory-api/provider_test.go +++ b/providers/cluster-inventory-api/provider_test.go @@ -45,7 +45,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder" @@ -109,7 +108,7 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() { setupAndStartControllers := func() { By("Setting up the cluster-aware manager, with the provider to lookup clusters", func() { var err error - mgr, err = mcmanager.New(cfgHub, provider, manager.Options{ + mgr, err = mcmanager.New(cfgHub, provider, mcmanager.Options{ Controller: config.Controller{ SkipNameValidation: ptr.To(true), }, diff --git a/providers/namespace/provider_test.go b/providers/namespace/provider_test.go index aa360a5..657a2c1 100644 --- a/providers/namespace/provider_test.go +++ b/providers/namespace/provider_test.go @@ -35,7 +35,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder" @@ -69,7 +68,7 @@ var _ = Describe("Provider Namespace", Ordered, func() { By("Setting up the cluster-aware manager, with the provider to lookup clusters", func() { var err error - mgr, err = mcmanager.New(cfg, provider, manager.Options{}) + mgr, err = mcmanager.New(cfg, provider, mcmanager.Options{}) Expect(err).NotTo(HaveOccurred()) })