Skip to content

Commit 7c5342c

Browse files
committed
return errors on reconciler registration
1 parent c5c3a92 commit 7c5342c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

internal/controller/registry.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ func (r *Registry) RegisterWithDryRunManager(mgr *dryrun.Manager, ap atlas.Provi
100100
}
101101

102102
func (r *Registry) RegisterWithManager(mgr ctrl.Manager, skipNameValidation bool, ap atlas.Provider) error {
103-
r.registerControllers(mgr, ap)
103+
if err := r.registerControllers(mgr, ap); err != nil {
104+
return fmt.Errorf("error registering controllers: %w", err)
105+
}
104106

105107
for _, reconciler := range r.reconcilers {
106108
if err := reconciler.SetupWithManager(mgr, skipNameValidation); err != nil {
@@ -110,9 +112,9 @@ func (r *Registry) RegisterWithManager(mgr ctrl.Manager, skipNameValidation bool
110112
return nil
111113
}
112114

113-
func (r *Registry) registerControllers(c cluster.Cluster, ap atlas.Provider) {
115+
func (r *Registry) registerControllers(c cluster.Cluster, ap atlas.Provider) error {
114116
if len(r.reconcilers) > 0 {
115-
return
117+
return nil
116118
}
117119

118120
var reconcilers []Reconciler
@@ -140,9 +142,8 @@ func (r *Registry) registerControllers(c cluster.Cluster, ap atlas.Provider) {
140142
// Add experimental controllers here
141143
reconcilers = append(reconcilers, connectionsecret.NewConnectionSecretReconciler(c, r.defaultPredicates(), ap, r.logger, r.globalSecretRef))
142144
groupReconciler, err := group.NewGroupReconciler(c, ap, r.logger, r.globalSecretRef, r.deletionProtection, true, r.defaultPredicates())
143-
// TODO(sur) remove this
144145
if err != nil {
145-
panic(err)
146+
return fmt.Errorf("error creating group reconciler: %v", err)
146147
}
147148
reconcilers = append(reconcilers, newCtrlStateReconciler(groupReconciler, r.maxConcurrentReconciles))
148149
}

0 commit comments

Comments
 (0)