diff --git a/internal/controller/gateway_resource_replicator_controller.go b/internal/controller/gateway_resource_replicator_controller.go index b25b1f12..d9a16426 100644 --- a/internal/controller/gateway_resource_replicator_controller.go +++ b/internal/controller/gateway_resource_replicator_controller.go @@ -1123,7 +1123,7 @@ func typedEnqueueRequestForGVK( ) mchandler.TypedEventHandlerFunc[client.Object, GVKRequest] { return func(clusterName multicluster.ClusterName, cl cluster.Cluster) handler.TypedEventHandler[client.Object, GVKRequest] { return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []GVKRequest { - if selector != nil && !selector.Matches(labels.Set(obj.GetLabels())) { + if selector != nil && !selector.Matches(labels.Set(obj.GetLabels())) && !isTerminatingWithReplicatorFinalizer(obj) { return nil } @@ -1145,6 +1145,10 @@ func typedEnqueueRequestForGVK( } } +func isTerminatingWithReplicatorFinalizer(obj client.Object) bool { + return !obj.GetDeletionTimestamp().IsZero() && controllerutil.ContainsFinalizer(obj, gatewayResourceReplicatorFinalizer) +} + func gvkKey(gvk schema.GroupVersionKind) string { return gvk.String() } diff --git a/internal/controller/gateway_resource_replicator_controller_test.go b/internal/controller/gateway_resource_replicator_controller_test.go index acabe718..2b222dec 100644 --- a/internal/controller/gateway_resource_replicator_controller_test.go +++ b/internal/controller/gateway_resource_replicator_controller_test.go @@ -261,6 +261,31 @@ func TestTypedEnqueueRequestForGVKFiltersBySelector(t *testing.T) { assert.Equal(t, testGVK, item.GVK, "unexpected GVK enqueued") } +func TestTypedEnqueueRequestForGVKEnqueuesTerminatingObjectWithFinalizer(t *testing.T) { + selector := labels.SelectorFromSet(map[string]string{"replicate": "true"}) + h := typedEnqueueRequestForGVK(testGVK, selector)("upstream", nil) + queue := workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[GVKRequest]()) + t.Cleanup(queue.ShutDown) + + ctx := context.Background() + now := metav1.Now() + + terminating := newUnstructuredObject("workloads", "example", nil, nil) + terminating.SetDeletionTimestamp(&now) + terminating.SetFinalizers([]string{"other.example.com/finalizer"}) + h.Update(ctx, event.TypedUpdateEvent[client.Object]{ObjectOld: terminating, ObjectNew: terminating}, queue) + assert.Equal(t, 0, queue.Len(), "terminating object without replicator finalizer must stay filtered") + + terminating.SetFinalizers([]string{gatewayResourceReplicatorFinalizer}) + h.Update(ctx, event.TypedUpdateEvent[client.Object]{ObjectOld: terminating, ObjectNew: terminating}, queue) + assert.Equal(t, 1, queue.Len(), "terminating object holding the replicator finalizer must be enqueued despite lost label") + + live := newUnstructuredObject("workloads", "other", nil, nil) + live.SetFinalizers([]string{gatewayResourceReplicatorFinalizer}) + h.Create(ctx, event.TypedCreateEvent[client.Object]{Object: live}, queue) + assert.Equal(t, 1, queue.Len(), "non-terminating unlabeled object must stay filtered") +} + func TestReplicatorCleansDownstreamOnDelete(t *testing.T) { scheme := runtime.NewScheme() err := corev1.AddToScheme(scheme)