Konnect entities: entities enqueued via EnqueueRequestsFromMapFunc from changes on other entities are missing event predicates

[pmalek]

Current Behavior

When an entity that can enqueue other entities undergoes an observed event (e.g. a change in KongConsumerGroup) then the dependent objects are enqueued (e.g. KongConsumers belonging to that group.

This is done via EnqueueRequestsFromMapFunc e.g. in here:

gateway-operator/controller/konnect/watch_kongconsumer.go

Lines 63 to 70 in 8961e81

	func(b *ctrl.Builder) *ctrl.Builder {
	return b.Watches(
	&configurationv1beta1.KongConsumerGroup{},
	handler.EnqueueRequestsFromMapFunc(
	enqueueKongConsumerForKongConsumerGroup(cl),
	),
	)
	},

for KongConsumerGroup.

This behavior is missing the predicates that are in place for enqueuing objects of the type in question itself: so in here KongConsumerGroups are enqueued for their own changes and filtered with objRefersToKonnectGatewayControlPlane in

gateway-operator/controller/konnect/watch_kongconsumer.go

Lines 38 to 44 in 8961e81

	func(b *ctrl.Builder) *ctrl.Builder {
	return b.For(&configurationv1.KongConsumer{},
	builder.WithPredicates(
	predicate.NewPredicateFuncs(objRefersToKonnectGatewayControlPlane[configurationv1.KongConsumer]),
	),
	)
	},

.

These predicates should also be added when using EnqueueRequestsFromMapFunc. Otherwise objects not referring to e.g. KonnectGatewayControlPlane and which should be reconciled by KIC, are going to be enqueued by KGO.

Expected Behavior

When using EnqueueRequestsFromMapFunc to enqueue dependent objects, all relevant predicates are in place to filter the requests only to be reconciled by KGO.

Proposed solution

Add predicates like so for all the types that enqueue objects of other type:

diff --git a/controller/konnect/watch_kongconsumer.go b/controller/konnect/watch_kongconsumer.go
index 385c9666..e8717699 100644
--- a/controller/konnect/watch_kongconsumer.go
+++ b/controller/konnect/watch_kongconsumer.go
@@ -66,6 +66,9 @@ func KongConsumerReconciliationWatchOptions(
                                handler.EnqueueRequestsFromMapFunc(
                                        enqueueKongConsumerForKongConsumerGroup(cl),
                                ),
+                               builder.WithPredicates(
+                                       predicate.NewPredicateFuncs(objRefersToKonnectGatewayControlPlane[configurationv1beta1.KongConsumerGroup]),
+                               ),
                        )
                },
        }

Operator Version

kubectl version