Refactor HTTPRoutePolicy status update and ancestor management

The `updateHTTPRoutePolicyStatus` function is replaced with `modifyHTTPRoutePolicyStatus` to streamline the process, and a new function `clearHTTPRoutePolicyRedundantAncestor` is introduced to remove redundant ancestors. Additionally, the group in the test's targetRefs is updated to `gateway.networking.k8s.io`.

Author: dspo

internal/controller/httproute_controller.go

@@ -265,10 +265,9 @@ func (r *HTTPRouteReconciler) listHTTPRouteByHTTPRoutePolicy(ctx context.Context
 	for key := range keys {
 		var httpRoute gatewayv1.HTTPRoute
 		if err := r.Get(ctx, client.ObjectKey{Namespace: string(key.Namespace), Name: string(key.Name)}, &httpRoute); err != nil {
-			r.Log.Error(err, "failed to get httproute by HTTPRoutePolicy targetRef", "namespace", obj.GetNamespace(), "name", obj.GetName())
-			if err := r.updateHTTPRoutePolicyStatus(key, *httpRoutePolicy, false, string(v1alpha2.PolicyReasonTargetNotFound), "not found HTTPRoute"); err != nil {
-				r.Log.Error(err, "failed to update HTTPRoutePolicy Status")
-			}
+			r.Log.Error(err, "failed to get HTTPRoute by HTTPRoutePolicy targetRef", "namespace", obj.GetNamespace(), "name", obj.GetName())
+			r.modifyHTTPRoutePolicyStatus(key, httpRoutePolicy, false, string(v1alpha2.PolicyReasonTargetNotFound), "not found HTTPRoute")
+			r.Log.Info("status after modified", "key", key, "status", httpRoutePolicy.Status.Ancestors)
 			continue
 		}
 		requests = append(requests, reconcile.Request{
@@ -279,6 +278,9 @@ func (r *HTTPRouteReconciler) listHTTPRouteByHTTPRoutePolicy(ctx context.Context
 		})
 	}
 
+	r.Log.Info("status before clear", "status", httpRoutePolicy.Status.Ancestors)
+	r.clearHTTPRoutePolicyRedundantAncestor(httpRoutePolicy)
+	r.Log.Info("status after clear", "status", httpRoutePolicy.Status.Ancestors)
 	if err := r.Status().Update(ctx, httpRoutePolicy); err != nil {
 		r.Log.Error(err, "failed to update HTTPRoutePolicy status", "namespace", obj.GetNamespace(), "name", obj.GetName())
 	}

internal/controller/httproutepolicy.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"context"
+	"slices"
 	"time"
 
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
@@ -68,7 +69,8 @@ func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateC
 
 	for key, policies := range checker.policies {
 		for _, policy := range policies {
-			if err := r.updateHTTPRoutePolicyStatus(key, policy, status, reason, message); err != nil {
+			r.modifyHTTPRoutePolicyStatus(key, &policy, status, reason, message)
+			if err := r.Status().Update(context.Background(), &policy); err != nil {
 				r.Log.Error(err, "failed to update HTTPRoutePolicyStatus")
 			}
 		}
@@ -77,7 +79,43 @@ func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateC
 	return nil
 }
 
-func (r *HTTPRouteReconciler) updateHTTPRoutePolicyStatus(key ancestorRefKey, policy v1alpha1.HTTPRoutePolicy, status bool, reason, message string) error {
+func (r *HTTPRouteReconciler) clearHTTPRoutePolicyRedundantAncestor(policy *v1alpha1.HTTPRoutePolicy) {
+	var keys = make(map[ancestorRefKey]struct{})
+	for _, ref := range policy.Spec.TargetRefs {
+		key := ancestorRefKey{
+			Group:     ref.Group,
+			Kind:      ref.Kind,
+			Namespace: gatewayv1.Namespace(policy.GetNamespace()),
+			Name:      ref.Name,
+		}
+		if ref.SectionName != nil {
+			key.SectionName = *ref.SectionName
+		}
+		r.Log.Info("clearHTTPRoutePolicyRedundantAncestor", "keys[]", key)
+		keys[key] = struct{}{}
+	}
+
+	policy.Status.Ancestors = slices.DeleteFunc(policy.Status.Ancestors, func(ancestor v1alpha2.PolicyAncestorStatus) bool {
+		key := ancestorRefKey{
+			Namespace: gatewayv1.Namespace(policy.GetNamespace()),
+			Name:      ancestor.AncestorRef.Name,
+		}
+		if ancestor.AncestorRef.Group != nil {
+			key.Group = *ancestor.AncestorRef.Group
+		}
+		if ancestor.AncestorRef.Kind != nil {
+			key.Kind = *ancestor.AncestorRef.Kind
+		}
+		if ancestor.AncestorRef.SectionName != nil {
+			key.SectionName = *ancestor.AncestorRef.SectionName
+		}
+		r.Log.Info("clearHTTPRoutePolicyRedundantAncestor", "key", key)
+		_, ok := keys[key]
+		return !ok
+	})
+}
+
+func (r *HTTPRouteReconciler) modifyHTTPRoutePolicyStatus(key ancestorRefKey, policy *v1alpha1.HTTPRoutePolicy, status bool, reason, message string) {
 	condition := metav1.Condition{
 		Type:               string(v1alpha2.PolicyConditionAccepted),
 		Status:             metav1.ConditionTrue,
@@ -90,12 +128,13 @@ func (r *HTTPRouteReconciler) updateHTTPRoutePolicyStatus(key ancestorRefKey, po
 		condition.Status = metav1.ConditionFalse
 	}
 	var hasAncestor bool
-	for _, ancestor := range policy.Status.Ancestors {
+	for i, ancestor := range policy.Status.Ancestors {
 		if ancestor.AncestorRef.Kind != nil && *ancestor.AncestorRef.Kind == key.Kind && ancestor.AncestorRef.Name == key.Name {
 			ancestor.ControllerName = v1alpha2.GatewayController(config.GetControllerName())
 			ancestor.Conditions = []metav1.Condition{condition}
 			hasAncestor = true
 		}
+		policy.Status.Ancestors[i] = ancestor
 	}
 	if !hasAncestor {
 		ref := v1alpha2.ParentReference{
@@ -113,7 +152,6 @@ func (r *HTTPRouteReconciler) updateHTTPRoutePolicyStatus(key ancestorRefKey, po
 			Conditions:     []metav1.Condition{condition},
 		})
 	}
-	return r.Status().Update(context.Background(), &policy)
 }
 
 type conflictChecker struct {

test/e2e/gatewayapi/httproute.go

@@ -297,11 +297,11 @@ metadata:
   name: http-route-policy-0
 spec:
   targetRefs:
-  - group: gateway.apisix.io
+  - group: gateway.networking.k8s.io
     kind: HTTPRoute
     name: httpbin
     # sectionName: get
-  - group: gateway.apisix.io
+  - group: gateway.networking.k8s.io
     kind: HTTPRoute
     name: httpbin-1
     sectionName: get