Make mcmanager.Options distinct from manager.Options

Author: ntnn

examples/cluster-api/main.go

@@ -81,10 +81,12 @@ 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{
-		LeaderElection: false, // TODO(sttts): how to sync that with the upper manager?
-		Metrics: metricsserver.Options{
-			BindAddress: "0", // only one can listen
+	mcMgr, err := mcmanager.New(cfg, provider, mcmanager.Options{
+		Options: manager.Options{
+			LeaderElection: false, // TODO(sttts): how to sync that with the upper manager?
+			Metrics: metricsserver.Options{
+				BindAddress: "0", // only one can listen
+			},
 		},
 	})
 	if err != nil {

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)

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)
 	}

pkg/builder/forked_controller_test.go

@@ -39,6 +39,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
@@ -291,9 +292,11 @@ var _ = Describe("application", func() {
 
 			By("creating a controller manager")
 			m, err := mcmanager.New(cfg, nil, mcmanager.Options{
-				Controller: config.Controller{
-					GroupKindConcurrency: map[string]int{
-						"ReplicaSet.apps": maxConcurrentReconciles,
+				Options: manager.Options{
+					Controller: config.Controller{
+						GroupKindConcurrency: map[string]int{
+							"ReplicaSet.apps": maxConcurrentReconciles,
+						},
 					},
 				},
 			})
@@ -538,7 +541,11 @@ var _ = Describe("application", func() {
 			// use a cache that intercepts requests for fully typed objects to
 			// ensure we use the projected versions
 			var err error
-			mgr, err = mcmanager.New(cfg, nil, mcmanager.Options{NewCache: newNonTypedOnlyCache})
+			mgr, err = mcmanager.New(cfg, nil, mcmanager.Options{
+				Options: manager.Options{
+					NewCache: newNonTypedOnlyCache,
+				},
+			})
 			Expect(err).NotTo(HaveOccurred())
 		})
 

pkg/manager/manager.go

@@ -112,7 +112,9 @@ type Manager interface {
 }
 
 // Options are the arguments for creating a new Manager.
-type Options = manager.Options
+type Options struct {
+	manager.Options
+}
 
 // Runnable allows a component to be started.
 // It's very important that Start blocks until
@@ -134,8 +136,8 @@ 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) {
-	mgr, err := manager.New(config, opts)
+func New(config *rest.Config, provider multicluster.Provider, opts Options) (Manager, error) {
+	mgr, err := manager.New(config, opts.Options)
 	if err != nil {
 		return nil, err
 	}

providers/kubeconfig/provider_test.go

@@ -38,6 +38,7 @@ 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"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
@@ -120,8 +121,10 @@ 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(localCfg, provider, mcmanager.Options{
-				Metrics: metricsserver.Options{
-					BindAddress: "0",
+				Options: manager.Options{
+					Metrics: metricsserver.Options{
+						BindAddress: "0",
+					},
 				},
 			})
 			Expect(err).NotTo(HaveOccurred())

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())
 		})