Skip to content

Commit 55d54ab

Browse files
authored
fix: use correct context for catalog watch handler (#516)
Signed-off-by: Joe Lanford <[email protected]>
1 parent 7f61f6d commit 55d54ab

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

internal/controllers/operator_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func (r *OperatorReconciler) SetupWithManager(mgr ctrl.Manager) error {
311311
err := ctrl.NewControllerManagedBy(mgr).
312312
For(&operatorsv1alpha1.Operator{}).
313313
Watches(&catalogd.Catalog{},
314-
handler.EnqueueRequestsFromMapFunc(operatorRequestsForCatalog(context.TODO(), mgr.GetClient(), mgr.GetLogger()))).
314+
handler.EnqueueRequestsFromMapFunc(operatorRequestsForCatalog(mgr.GetClient(), mgr.GetLogger()))).
315315
Owns(&rukpakv1alpha1.BundleDeployment{}).
316316
Complete(r)
317317

@@ -441,8 +441,8 @@ func setInstalledStatusConditionUnknown(conditions *[]metav1.Condition, message
441441
}
442442

443443
// Generate reconcile requests for all operators affected by a catalog change
444-
func operatorRequestsForCatalog(ctx context.Context, c client.Reader, logger logr.Logger) handler.MapFunc {
445-
return func(_ context.Context, _ client.Object) []reconcile.Request {
444+
func operatorRequestsForCatalog(c client.Reader, logger logr.Logger) handler.MapFunc {
445+
return func(ctx context.Context, _ client.Object) []reconcile.Request {
446446
// no way of associating an operator to a catalog so create reconcile requests for everything
447447
operators := operatorsv1alpha1.OperatorList{}
448448
err := c.List(ctx, &operators)

0 commit comments

Comments
 (0)