feat: Add support for HTTPRoutePolicy in HTTPRoute reconciliation

Author: dspo

internal/controller/httproute_controller.go

@@ -65,6 +65,9 @@ func (r *HTTPRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				},
 			),
 		).
+		Watches(&v1alpha1.HTTPRoutePolicy{},
+			handler.EnqueueRequestsFromMapFunc(r.listHTTPRouteByHTTPRoutePolicy),
+		).
 		Complete(r)
 }
 
@@ -232,6 +235,36 @@ func (r *HTTPRouteReconciler) listHTTPRoutesForGateway(ctx context.Context, obj
 	return requests
 }
 
+func (r *HTTPRouteReconciler) listHTTPRouteByHTTPRoutePolicy(ctx context.Context, obj client.Object) (requests []reconcile.Request) {
+	httpRoutePolicy, ok := obj.(*v1alpha1.HTTPRoutePolicy)
+	if !ok {
+		r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to HTTPRoutePolicy")
+		return nil
+	}
+
+	var keys = make(map[client.ObjectKey]struct{})
+	for _, ref := range httpRoutePolicy.Spec.TargetRefs {
+		if ref.Kind == "HTTPRoute" {
+			keys[client.ObjectKey{
+				Namespace: obj.GetNamespace(),
+				Name:      string(ref.Name),
+			}] = struct{}{}
+		}
+	}
+	for key := range keys {
+		var httpRoute gatewayv1.HTTPRoute
+		if err := r.Get(ctx, key, &httpRoute); err != nil {
+			r.Log.Error(err, "failed to get httproute by HTTPRoutePolicy targetRef", "HTTPRoutePolicy", obj.GetName())
+			continue
+		}
+		requests = append(requests, reconcile.Request{
+			NamespacedName: key,
+		})
+	}
+
+	return requests
+}
+
 func (r *HTTPRouteReconciler) processHTTPRouteBackendRefs(tctx *provider.TranslateContext) error {
 	var terr error
 	for _, backend := range tctx.BackendRefs {
@@ -290,7 +323,7 @@ func (r *HTTPRouteReconciler) processHTTPRouteBackendRefs(tctx *provider.Transla
 	return terr
 }
 
-func (t *HTTPRouteReconciler) processHTTPRoute(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) error {
+func (r *HTTPRouteReconciler) processHTTPRoute(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) error {
 	var terror error
 	for _, rule := range httpRoute.Spec.Rules {
 		for _, filter := range rule.Filters {
@@ -299,7 +332,7 @@ func (t *HTTPRouteReconciler) processHTTPRoute(tctx *provider.TranslateContext,
 			}
 			if filter.ExtensionRef.Kind == "PluginConfig" {
 				pluginconfig := new(v1alpha1.PluginConfig)
-				if err := t.Get(context.Background(), client.ObjectKey{
+				if err := r.Get(context.Background(), client.ObjectKey{
 					Namespace: httpRoute.GetNamespace(),
 					Name:      string(filter.ExtensionRef.Name),
 				}, pluginconfig); err != nil {
@@ -340,6 +373,20 @@ func (t *HTTPRouteReconciler) processHTTPRoute(tctx *provider.TranslateContext,
 				},
 			})
 		}
+
+		var httpRoutePolicyList v1alpha1.HTTPRoutePolicyList
+		var ruleName string
+		if rule.Name != nil {
+			ruleName = string(*rule.Name)
+		}
+		key := indexer.GenHTTPRoutePolicyIndexKey(v1alpha1.GroupVersion.Group, "HTTPRoute", httpRoute.GetNamespace(), httpRoute.GetName(), ruleName)
+		if err := r.List(context.Background(), &httpRoutePolicyList, client.MatchingFields{indexer.HTTPRoutePolicy: key}); err != nil {
+			terror = err
+			continue
+		}
+		for _, item := range httpRoutePolicyList.Items {
+			tctx.HTTPRoutePolicies[ruleName] = append(tctx.HTTPRoutePolicies[key], item.Spec)
+		}
 	}
 
 	return terror

internal/controller/indexer/indexer.go

@@ -3,22 +3,26 @@ package indexer
 import (
 	"context"
 
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	networkingv1 "k8s.io/api/networking/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 )
 
 const (
-	ServiceIndexRef    = "serviceRefs"
-	ExtensionRef       = "extensionRef"
-	ParametersRef      = "parametersRef"
-	ParentRefs         = "parentRefs"
-	IngressClass       = "ingressClass"
-	SecretIndexRef     = "secretRefs"
-	IngressClassRef    = "ingressClassRef"
-	ConsumerGatewayRef = "consumerGatewayRef"
+	ServiceIndexRef          = "serviceRefs"
+	ExtensionRef             = "extensionRef"
+	ParametersRef            = "parametersRef"
+	ParentRefs               = "parentRefs"
+	IngressClass             = "ingressClass"
+	SecretIndexRef           = "secretRefs"
+	IngressClassRef          = "ingressClassRef"
+	ConsumerGatewayRef       = "consumerGatewayRef"
+	HTTPRoutePolicyTargetRef = "httpRoutePolicyTargetRef"
+	HTTPRoutePolicy          = "httpRoutePolicy"
 )
 
 func SetupIndexer(mgr ctrl.Manager) error {
@@ -128,6 +132,16 @@ func setupHTTPRouteIndexer(mgr ctrl.Manager) error {
 	); err != nil {
 		return err
 	}
+
+	if err := mgr.GetFieldIndexer().IndexField(
+		context.Background(),
+		&v1alpha1.HTTPRoutePolicy{},
+		HTTPRoutePolicy,
+		HTTPRoutePolicyIndexFunc,
+	); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -281,6 +295,23 @@ func HTTPRouteExtensionIndexFunc(rawObj client.Object) []string {
 	return keys
 }
 
+func GenHTTPRoutePolicyIndexKey(group, kind, namespace, name, sectionName string) string {
+	return schema.GroupKind{Group: group, Kind: kind}.String() + "/" + client.ObjectKey{Namespace: namespace, Name: name}.String() + "/" + sectionName
+}
+
+func HTTPRoutePolicyIndexFunc(rawObj client.Object) []string {
+	hrp := rawObj.(*v1alpha1.HTTPRoutePolicy)
+	var keys = make([]string, 0, len(hrp.Spec.TargetRefs))
+	for i, ref := range hrp.Spec.TargetRefs {
+		var sectionName string
+		if ref.SectionName != nil {
+			sectionName = string(*ref.SectionName)
+		}
+		keys[i] = GenHTTPRoutePolicyIndexKey(v1alpha1.GroupVersion.Group, string(ref.Kind), hrp.GetNamespace(), string(ref.Name), sectionName)
+	}
+	return keys
+}
+
 func GatewayParametersRefIndexFunc(rawObj client.Object) []string {
 	gw := rawObj.(*gatewayv1.Gateway)
 	if gw.Spec.Infrastructure != nil && gw.Spec.Infrastructure.ParametersRef != nil {

internal/provider/adc/translator/httproute.go

@@ -231,6 +231,23 @@ func (t *Translator) fillPluginFromHTTPRequestRedirectFilter(plugins adctypes.Pl
 	plugin.URI = uri
 }
 
+func (t *Translator) fillHTTPRoutePolicies(tctx *provider.TranslateContext, rule gatewayv1.HTTPRouteRule, routes []*adctypes.Route) {
+	var ruleName string
+	if rule.Name != nil {
+		ruleName = string(*rule.Name)
+	}
+	specs, ok := tctx.HTTPRoutePolicies[ruleName]
+	if !ok || len(specs) == 0 {
+		return
+	}
+	for _, route := range routes {
+		for _, spec := range specs {
+			route.Priority = spec.Priority
+			route.Vars = append(route.Vars, spec.Vars...)
+		}
+	}
+}
+
 func (t *Translator) translateEndpointSlice(weight int, endpointSlices []discoveryv1.EndpointSlice) adctypes.UpstreamNodes {
 	var nodes adctypes.UpstreamNodes
 	if len(endpointSlices) == 0 {
@@ -337,6 +354,7 @@ func (t *Translator) TranslateHTTPRoute(tctx *provider.TranslateContext, httpRou
 			route.Labels = labels
 			routes = append(routes, route)
 		}
+		t.fillHTTPRoutePolicies(tctx, rule, routes)
 		service.Routes = routes
 
 		result.Services = append(result.Services, service)

internal/provider/provider.go

@@ -7,9 +7,10 @@ import (
 	discoveryv1 "k8s.io/api/discovery/v1"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 )
 
 type Provider interface {
@@ -18,14 +19,15 @@ type Provider interface {
 }
 
 type TranslateContext struct {
-	BackendRefs      []gatewayv1.BackendRef
-	GatewayTLSConfig []gatewayv1.GatewayTLSConfig
-	GatewayProxy     *v1alpha1.GatewayProxy
-	Credentials      []v1alpha1.Credential
-	EndpointSlices   map[types.NamespacedName][]discoveryv1.EndpointSlice
-	Secrets          map[types.NamespacedName]*corev1.Secret
-	PluginConfigs    map[types.NamespacedName]*v1alpha1.PluginConfig
-	Services         map[types.NamespacedName]*corev1.Service
+	BackendRefs       []gatewayv1.BackendRef
+	GatewayTLSConfig  []gatewayv1.GatewayTLSConfig
+	GatewayProxy      *v1alpha1.GatewayProxy
+	Credentials       []v1alpha1.Credential
+	EndpointSlices    map[types.NamespacedName][]discoveryv1.EndpointSlice
+	Secrets           map[types.NamespacedName]*corev1.Secret
+	PluginConfigs     map[types.NamespacedName]*v1alpha1.PluginConfig
+	Services          map[types.NamespacedName]*corev1.Service
+	HTTPRoutePolicies map[string][]v1alpha1.HTTPRoutePolicySpec
 }
 
 func NewDefaultTranslateContext() *TranslateContext {