fix: gateway proxy

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

internal/controller/gatewayproxy_controller.go

@@ -62,6 +62,13 @@ func (r *GatewayProxyController) SetupWithManager(mrg ctrl.Manager) error {
 	// Check and store EndpointSlice API support
 	r.supportsEndpointSlice = pkgutils.HasAPIResource(mrg, &discoveryv1.EndpointSlice{})
 	r.supportsGateway = pkgutils.HasAPIResource(mrg, &gatewayv1.Gateway{})
+	var icWatch client.Object
+	switch r.ICGV.String() {
+	case networkingv1beta1.SchemeGroupVersion.String():
+		icWatch = &networkingv1beta1.IngressClass{}
+	default:
+		icWatch = &networkingv1.IngressClass{}
+	}
 
 	eventFilters := []predicate.Predicate{
 		predicate.GenerationChangedPredicate{},
@@ -77,6 +84,10 @@ func (r *GatewayProxyController) SetupWithManager(mrg ctrl.Manager) error {
 		WithEventFilter(predicate.Or(eventFilters...)).
 		Watches(&corev1.Service{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewayProxiesForProviderService),
+		).
+		Watches(
+			icWatch,
+			handler.EnqueueRequestsFromMapFunc(r.listGatewayProxiesForIngressClass),
 		)
 
 	// Conditionally watch EndpointSlice or Endpoints based on cluster API support
@@ -85,6 +96,12 @@ func (r *GatewayProxyController) SetupWithManager(mrg ctrl.Manager) error {
 		r.listGatewayProxiesForProviderEndpoints,
 		r.Log)
 
+	if r.supportsGateway {
+		bdr = bdr.Watches(&gatewayv1.Gateway{},
+			handler.EnqueueRequestsFromMapFunc(r.listGatewayProxiesByGateway),
+		)
+	}
+
 	return bdr.
 		Watches(&corev1.Secret{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewayProxiesForSecret),
@@ -265,3 +282,32 @@ func (r *GatewayProxyController) listGatewayProxiesForSecret(ctx context.Context
 		indexer.SecretIndexRef: indexer.GenIndexKey(secret.GetNamespace(), secret.GetName()),
 	})
 }
+
+func (r *GatewayProxyController) listGatewayProxiesForIngressClass(ctx context.Context, object client.Object) []reconcile.Request {
+	ingressClass := pkgutils.ConvertToIngressClassV1(object)
+
+	reqs := []reconcile.Request{}
+	gp, _ := GetGatewayProxyByIngressClass(ctx, r.Client, ingressClass)
+	if gp != nil {
+		reqs = append(reqs, reconcile.Request{
+			NamespacedName: utils.NamespacedName(gp),
+		})
+	}
+	return reqs
+}
+
+func (r *GatewayProxyController) listGatewayProxiesByGateway(ctx context.Context, object client.Object) []reconcile.Request {
+	gateway, ok := object.(*gatewayv1.Gateway)
+	if !ok {
+		r.Log.Error(errors.New("unexpected object type"), "failed to convert object to IngressClass")
+		return nil
+	}
+	reqs := []reconcile.Request{}
+	gp, _ := GetGatewayProxyByGateway(ctx, r.Client, gateway)
+	if gp != nil {
+		reqs = append(reqs, reconcile.Request{
+			NamespacedName: utils.NamespacedName(gp),
+		})
+	}
+	return reqs
+}

internal/controller/utils.go

@@ -1679,3 +1679,53 @@ func ExtractIngressClass(obj client.Object) string {
 		panic(fmt.Errorf("unhandled object type %T for extracting ingress class", obj))
 	}
 }
+
+func GetGatewayProxyByIngressClass(ctx context.Context, r client.Client, ingressClass *networkingv1.IngressClass) (*v1alpha1.GatewayProxy, error) {
+	if ingressClass.Spec.Parameters == nil {
+		return nil, nil
+	}
+
+	if ingressClass.Spec.Parameters.APIGroup == nil ||
+		*ingressClass.Spec.Parameters.APIGroup != v1alpha1.GroupVersion.Group ||
+		ingressClass.Spec.Parameters.Kind != KindGatewayProxy {
+		return nil, nil
+	}
+
+	namespace := ingressClass.Namespace
+	if ingressClass.Spec.Parameters.Namespace != nil {
+		namespace = *ingressClass.Spec.Parameters.Namespace
+	}
+
+	gatewayProxy := new(v1alpha1.GatewayProxy)
+	if err := r.Get(ctx, client.ObjectKey{
+		Namespace: namespace,
+		Name:      ingressClass.Spec.Parameters.Name,
+	}, gatewayProxy); err != nil {
+		return nil, fmt.Errorf("failed to get gateway proxy: %w", err)
+	}
+	return gatewayProxy, nil
+}
+
+func GetGatewayProxyByGateway(ctx context.Context, r client.Client, gateway *gatewayv1.Gateway) (*v1alpha1.GatewayProxy, error) {
+	if gateway == nil {
+		return nil, nil
+	}
+	infra := gateway.Spec.Infrastructure
+	if infra == nil || infra.ParametersRef == nil {
+		return nil, nil
+	}
+
+	ns := gateway.GetNamespace()
+	paramRef := infra.ParametersRef
+	if string(paramRef.Group) != v1alpha1.GroupVersion.Group || string(paramRef.Kind) != KindGatewayProxy {
+		return nil, nil
+	}
+	gatewayProxy := &v1alpha1.GatewayProxy{}
+	if err := r.Get(context.Background(), client.ObjectKey{
+		Namespace: ns,
+		Name:      paramRef.Name,
+	}, gatewayProxy); err != nil {
+		return nil, fmt.Errorf("failed to get GatewayProxy: %w", err)
+	}
+	return gatewayProxy, nil
+}