diff --git a/controllers/httproute_controller.go b/controllers/httproute_controller.go index 7e78f9c..85c7a39 100644 --- a/controllers/httproute_controller.go +++ b/controllers/httproute_controller.go @@ -22,6 +22,10 @@ const ( triggerAnnotation = "probe-controller.local/register" checksumAnnotation = "probe-controller.local/checksum" finalizerName = "probe-controller.local/finalizer" + + eventCreated = "CREATED" + eventUpdated = "UPDATED" + eventDeleted = "DELETED" ) type HTTPRouteWatcher struct { @@ -97,9 +101,9 @@ func (r *HTTPRouteWatcher) Reconcile(ctx context.Context, req ctrl.Request) (ctr return ctrl.Result{}, nil } - eventType := "UPDATED" + eventType := eventUpdated if lastSyncedHash == "" { - eventType = "CREATED" + eventType = eventCreated } payload := WebhookPayload{ @@ -113,7 +117,7 @@ func (r *HTTPRouteWatcher) Reconcile(ctx context.Context, req ctrl.Request) (ctr return ctrl.Result{}, err } - // Record synced generation to avoid re-triggering on status updates + // Record checksum to avoid re-triggering on status updates if route.Annotations == nil { route.Annotations = make(map[string]string) } @@ -154,6 +158,10 @@ func (r *HTTPRouteWatcher) callExternalAPI(ctx context.Context, payload WebhookP _ = resp.Body.Close() }() + if payload.Event == eventDeleted && (resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusGone) { + return nil + } + if resp.StatusCode >= 400 { return fmt.Errorf("external api failed with http %d", resp.StatusCode) } @@ -221,7 +229,7 @@ func routeEventFilter() predicate.Predicate { // finalizer deletion is handled via UpdateEvent when // DeletionTimestamp is set. // This is a placeholder in case fallback cleanup is needed. - return false + return true }, GenericFunc: func(e event.GenericEvent) bool { return isTracked(e.Object) diff --git a/controllers/httproute_controller_test.go b/controllers/httproute_controller_test.go index faa9f4d..9c26f10 100644 --- a/controllers/httproute_controller_test.go +++ b/controllers/httproute_controller_test.go @@ -8,6 +8,7 @@ import ( "sync" "testing" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" @@ -120,7 +121,7 @@ func TestHTTPRouteWatcher_Lifecycle(t *testing.T) { } events := env.recordedEvents() - if len(events) != 1 || events[0].Event != "CREATED" { + if len(events) != 1 || events[0].Event != eventCreated { t.Fatalf("expected 1 CREATED event, got: %+v", events) } if len(events[0].Hostnames) != 1 || events[0].Hostnames[0] != "app.example.com" { @@ -156,7 +157,7 @@ func TestHTTPRouteWatcher_Lifecycle(t *testing.T) { } events = env.recordedEvents() - if len(events) != 2 || events[1].Event != "UPDATED" { + if len(events) != 2 || events[1].Event != eventUpdated { t.Fatalf("expected UPDATED event, got: %+v", events) } if len(events[1].Hostnames) != 1 || events[1].Hostnames[0] != "www.example.com" { @@ -174,7 +175,7 @@ func TestHTTPRouteWatcher_Lifecycle(t *testing.T) { } events = env.recordedEvents() - if len(events) != 3 || events[2].Event != "DELETED" { + if len(events) != 3 || events[2].Event != eventDeleted { t.Fatalf("expected DELETED event, got: %+v", events) } } @@ -285,6 +286,44 @@ func TestHTTPRouteWatcher_ErrorsAndAuth(t *testing.T) { wantFinalizerKept: true, wantAuthHeader: "Bearer super-secret-token", }, + { + name: "API 404 on delete succeeds and removes finalizer", + route: &gatewayv1.HTTPRoute{ + Name: "already-gone-404", + Namespace: "default", + Finalizers: []string{finalizerName}, + Annotations: map[string]string{triggerAnnotation: "true"}, + }, + deleteBeforeSync: true, + apiStatusCode: http.StatusNotFound, + wantErr: false, + wantFinalizerKept: false, + }, + { + name: "API 410 on delete succeeds and removes finalizer", + route: &gatewayv1.HTTPRoute{ + Name: "already-gone-410", + Namespace: "default", + Finalizers: []string{finalizerName}, + Annotations: map[string]string{triggerAnnotation: "true"}, + }, + deleteBeforeSync: true, + apiStatusCode: http.StatusGone, + wantErr: false, + wantFinalizerKept: false, + }, + { + name: "API 404 on create still fails", + route: &gatewayv1.HTTPRoute{ + Name: "missing-endpoint-create", + Namespace: "default", + Finalizers: []string{finalizerName}, + Annotations: map[string]string{triggerAnnotation: "true"}, + }, + apiStatusCode: http.StatusNotFound, + wantErr: true, + wantFinalizerKept: true, + }, } for _, tc := range tests { @@ -328,15 +367,20 @@ func TestHTTPRouteWatcher_ErrorsAndAuth(t *testing.T) { if tc.route != nil { var current gatewayv1.HTTPRoute - if err := env.client.Get(ctx, req.NamespacedName, ¤t); err != nil { - t.Fatalf("failed to get route after reconcile: %v", err) + err := env.client.Get(ctx, req.NamespacedName, ¤t) + if !tc.wantFinalizerKept { + if !apierrors.IsNotFound(err) && controllerutil.ContainsFinalizer(¤t, finalizerName) { + t.Fatalf("expected route to be deleted or finalizer removed, err=%v, finalizers=%v", err, current.Finalizers) + } + return } - hasFinalizer := controllerutil.ContainsFinalizer(¤t, finalizerName) - if hasFinalizer != tc.wantFinalizerKept { - t.Fatalf("finalizer present = %v, want %v", hasFinalizer, tc.wantFinalizerKept) + if err != nil { + t.Fatalf("failed to get route after reconcile: %v", err) + } + if !controllerutil.ContainsFinalizer(¤t, finalizerName) { + t.Fatalf("expected finalizer %q to remain, got: %v", finalizerName, current.Finalizers) } - if tc.wantErr && current.Annotations[checksumAnnotation] != "" { t.Fatalf("expected checksumAnnotation not to be stamped on failed API call, got %q", current.Annotations[checksumAnnotation]) } @@ -429,7 +473,7 @@ func TestRouteEventFilter(t *testing.T) { if !pred.Create(event.CreateEvent{Object: tracked}) { t.Error("expected tracked CreateEvent to pass") } - if pred.Delete(event.DeleteEvent{Object: tracked}) { + if !pred.Delete(event.DeleteEvent{Object: tracked}) { t.Error("expected DeleteEvent to be skipped") } if !pred.Generic(event.GenericEvent{Object: tracked}) { diff --git a/main.go b/main.go index 1ebf908..2cf06ff 100644 --- a/main.go +++ b/main.go @@ -68,7 +68,7 @@ func main() { Metrics: metricsserver.Options{BindAddress: metricsAddr}, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, - LeaderElectionID: "example.com", + LeaderElectionID: "probe-controller-leader", }) if err != nil { setupLog.Error(err, "unable to start manager")