Skip to content

Commit b80b0aa

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #67 from ntnn/cleanup-mcm-options
 🌱 Use mcmanager.Options instead of manager.Options where applicable
2 parents 93b8ce8 + 9d874dd commit b80b0aa

File tree

9 files changed

+9
-16
lines changed

9 files changed

+9
-16
lines changed

‎alias.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/client/config"
2525
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2626
"sigs.k8s.io/controller-runtime/pkg/log"
27-
"sigs.k8s.io/controller-runtime/pkg/manager"
2827
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
2928
reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
3029
"sigs.k8s.io/controller-runtime/pkg/scheme"
@@ -50,7 +49,7 @@ type Result = reconcile.Result
5049
type Manager = mcmanager.Manager
5150

5251
// Options are the arguments for creating a new Manager.
53-
type Options = manager.Options
52+
type Options = mcmanager.Options
5453

5554
// SchemeBuilder builds a new Scheme for mapping go types to Kubernetes GroupVersionKinds.
5655
type SchemeBuilder = scheme.Builder

‎examples/cluster-api/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func main() {
8181

8282
// Create a multi-cluster manager attached to the provider.
8383
entryLog.Info("Setting up local manager")
84-
mcMgr, err := mcmanager.New(cfg, provider, manager.Options{
84+
mcMgr, err := mcmanager.New(cfg, provider, mcmanager.Options{
8585
LeaderElection: false, // TODO(sttts): how to sync that with the upper manager?
8686
Metrics: metricsserver.Options{
8787
BindAddress: "0", // only one can listen

‎examples/cluster-inventory-api/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
ctrl "sigs.k8s.io/controller-runtime"
3434
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
3535
"sigs.k8s.io/controller-runtime/pkg/log/zap"
36-
"sigs.k8s.io/controller-runtime/pkg/manager"
3736
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
3837
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3938
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -92,7 +91,7 @@ func main() {
9291

9392
// Create a multi-cluster manager attached to the provider.
9493
entryLog.Info("Setting up manager")
95-
mcMgr, err := mcmanager.New(cfg, provider, manager.Options{
94+
mcMgr, err := mcmanager.New(cfg, provider, mcmanager.Options{
9695
LeaderElection: false,
9796
Metrics: metricsserver.Options{
9897
BindAddress: "0", // only one can listen

‎examples/kind/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
ctrl "sigs.k8s.io/controller-runtime"
3030
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
3131
"sigs.k8s.io/controller-runtime/pkg/log/zap"
32-
"sigs.k8s.io/controller-runtime/pkg/manager"
3332
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
3433
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3534

@@ -45,7 +44,7 @@ func main() {
4544
ctx := signals.SetupSignalHandler()
4645

4746
provider := kind.New()
48-
mgr, err := mcmanager.New(ctrl.GetConfigOrDie(), provider, manager.Options{})
47+
mgr, err := mcmanager.New(ctrl.GetConfigOrDie(), provider, mcmanager.Options{})
4948
if err != nil {
5049
entryLog.Error(err, "unable to create manager")
5150
os.Exit(1)

‎examples/kubeconfig/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
ctrl "sigs.k8s.io/controller-runtime"
2929
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
3030
"sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
"sigs.k8s.io/controller-runtime/pkg/manager"
3231
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3332
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3433

@@ -70,7 +69,7 @@ func main() {
7069
provider := kubeconfigprovider.New(providerOpts)
7170

7271
// Setup a cluster-aware Manager, with the provider to lookup clusters.
73-
managerOpts := manager.Options{
72+
managerOpts := mcmanager.Options{
7473
Metrics: metricsserver.Options{
7574
BindAddress: "0", // Disable metrics server
7675
},

‎examples/namespace/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import (
4040
"sigs.k8s.io/controller-runtime/pkg/envtest"
4141
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
4242
"sigs.k8s.io/controller-runtime/pkg/log/zap"
43-
"sigs.k8s.io/controller-runtime/pkg/manager"
4443
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
4544
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4645

@@ -117,7 +116,7 @@ func run(ctx context.Context, log logr.Logger, kubeconfig string) error {
117116

118117
// Setup a cluster-aware Manager, with the provider to lookup clusters.
119118
log.Info("Setting up cluster-aware manager")
120-
mgr, err := mcmanager.New(cfg, provider, manager.Options{})
119+
mgr, err := mcmanager.New(cfg, provider, mcmanager.Options{})
121120
if err != nil {
122121
return fmt.Errorf("unable to set up overall controller manager: %w", err)
123122
}

‎pkg/manager/manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ type mcManager struct {
134134
// New returns a new Manager for creating Controllers. The provider is used to
135135
// discover and manage clusters. With a provider set to nil, the manager will
136136
// behave like a regular controller-runtime manager.
137-
func New(config *rest.Config, provider multicluster.Provider, opts manager.Options) (Manager, error) {
137+
func New(config *rest.Config, provider multicluster.Provider, opts Options) (Manager, error) {
138138
mgr, err := manager.New(config, opts)
139139
if err != nil {
140140
return nil, err

‎providers/cluster-inventory-api/provider_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import (
4545
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4646
"sigs.k8s.io/controller-runtime/pkg/envtest"
4747
"sigs.k8s.io/controller-runtime/pkg/log"
48-
"sigs.k8s.io/controller-runtime/pkg/manager"
4948
"sigs.k8s.io/controller-runtime/pkg/reconcile"
5049

5150
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
@@ -109,7 +108,7 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() {
109108
setupAndStartControllers := func() {
110109
By("Setting up the cluster-aware manager, with the provider to lookup clusters", func() {
111110
var err error
112-
mgr, err = mcmanager.New(cfgHub, provider, manager.Options{
111+
mgr, err = mcmanager.New(cfgHub, provider, mcmanager.Options{
113112
Controller: config.Controller{
114113
SkipNameValidation: ptr.To(true),
115114
},

‎providers/namespace/provider_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/cluster"
3737
"sigs.k8s.io/controller-runtime/pkg/log"
38-
"sigs.k8s.io/controller-runtime/pkg/manager"
3938
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4039

4140
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
@@ -69,7 +68,7 @@ var _ = Describe("Provider Namespace", Ordered, func() {
6968

7069
By("Setting up the cluster-aware manager, with the provider to lookup clusters", func() {
7170
var err error
72-
mgr, err = mcmanager.New(cfg, provider, manager.Options{})
71+
mgr, err = mcmanager.New(cfg, provider, mcmanager.Options{})
7372
Expect(err).NotTo(HaveOccurred())
7473
})
7574

0 commit comments

Comments
 (0)