Skip to content

🌱 Use mcmanager.Options instead of manager.Options where applicable #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2025
+9 −16
Merged

🌱 Use mcmanager.Options instead of manager.Options where applicable #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions examples/cluster-inventory-api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions examples/kind/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions examples/kubeconfig/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
},
Expand Down
3 changes: 1 addition & 2 deletions examples/namespace/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions providers/cluster-inventory-api/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
},
Expand Down
3 changes: 1 addition & 2 deletions providers/namespace/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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())
})

Expand Down