Skip to content

🐛Make mcmanager.Options distinct from manager.Options #64

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🐛Make mcmanager.Options distinct from manager.Options #64

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
8 changes: 5 additions & 3 deletions examples/cluster-api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,11 @@ func main() {
// Create a multi-cluster manager attached to the provider.
entryLog.Info("Setting up local manager")
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
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 {
Expand Down
9 changes: 6 additions & 3 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,6 +33,7 @@ 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,9 +93,11 @@ func main() {
// Create a multi-cluster manager attached to the provider.
entryLog.Info("Setting up manager")
mcMgr, err := mcmanager.New(cfg, provider, mcmanager.Options{
LeaderElection: false,
Metrics: metricsserver.Options{
BindAddress: "0", // only one can listen
Options: manager.Options{
LeaderElection: false,
Metrics: metricsserver.Options{
BindAddress: "0", // only one can listen
},
},
})
if err != nil {
Expand Down
15 changes: 11 additions & 4 deletions pkg/builder/forked_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
},
},
},
})
Expand Down Expand Up @@ -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())
})

Expand Down
6 changes: 4 additions & 2 deletions pkg/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -135,7 +137,7 @@ type mcManager struct {
// 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 Options) (Manager, error) {
mgr, err := manager.New(config, opts)
mgr, err := manager.New(config, opts.Options)
if err != nil {
return nil, err
}
Expand Down
7 changes: 5 additions & 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,6 +45,7 @@ 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,8 +110,10 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() {
By("Setting up the cluster-aware manager, with the provider to lookup clusters", func() {
var err error
mgr, err = mcmanager.New(cfgHub, provider, mcmanager.Options{
Controller: config.Controller{
SkipNameValidation: ptr.To(true),
Options: manager.Options{
Controller: config.Controller{
SkipNameValidation: ptr.To(true),
},
},
})
Expect(err).NotTo(HaveOccurred())
Expand Down
7 changes: 5 additions & 2 deletions providers/kubeconfig/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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())
Expand Down
3 changes: 1 addition & 2 deletions providers/multi/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 @@ -89,7 +88,7 @@ var _ = Describe("Provider Multi", Ordered, func() {
provider = New(Options{})

var err error
mgr, err = mcmanager.New(localCfg, provider, manager.Options{})
mgr, err = mcmanager.New(localCfg, provider, mcmanager.Options{})
Expect(err).NotTo(HaveOccurred())

provider.SetManager(mgr)
Expand Down