Skip to content

Commit 7f0646d

Browse files
committed
fix test
1 parent cec6905 commit 7f0646d

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

internal/controller/apisixroute_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ func (r *ApisixRouteReconciler) listApisixRouteForIngressClass(ctx context.Conte
584584
}
585585

586586
func (r *ApisixRouteReconciler) listApisixRouteForGatewayProxy(ctx context.Context, object client.Object) (requests []reconcile.Request) {
587-
return listIngressClassRequestsForGatewayProxy(ctx, r.Client, object, r.Log, r.listApisixRouteForIngressClass)
587+
return listIngressClassV1beta1RequestsForGatewayProxy(ctx, r.Client, object, r.Log, r.listApisixRouteForIngressClass)
588588
}
589589

590590
func (r *ApisixRouteReconciler) listApisixRouteForApisixUpstream(ctx context.Context, object client.Object) (requests []reconcile.Request) {

internal/controller/utils.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,6 +1225,40 @@ func ListMatchingRequests(
12251225
return requests
12261226
}
12271227

1228+
func listIngressClassV1beta1RequestsForGatewayProxy(
1229+
ctx context.Context,
1230+
c client.Client,
1231+
obj client.Object,
1232+
logger logr.Logger,
1233+
listFunc func(context.Context, client.Object) []reconcile.Request,
1234+
) []reconcile.Request {
1235+
gatewayProxy, ok := obj.(*v1alpha1.GatewayProxy)
1236+
if !ok {
1237+
return nil
1238+
}
1239+
1240+
ingressClassList := &networkingv1beta1.IngressClassList{}
1241+
if err := c.List(ctx, ingressClassList, client.MatchingFields{
1242+
indexer.IngressClassParametersRef: indexer.GenIndexKey(gatewayProxy.GetNamespace(), gatewayProxy.GetName()),
1243+
}); err != nil {
1244+
logger.Error(err, "failed to list ingress classes for gateway proxy", "gatewayproxy", gatewayProxy.GetName())
1245+
return nil
1246+
}
1247+
1248+
requestSet := make(map[string]reconcile.Request)
1249+
for _, ingressClass := range ingressClassList.Items {
1250+
for _, req := range listFunc(ctx, &ingressClass) {
1251+
requestSet[req.String()] = req
1252+
}
1253+
}
1254+
1255+
requests := make([]reconcile.Request, 0, len(requestSet))
1256+
for _, req := range requestSet {
1257+
requests = append(requests, req)
1258+
}
1259+
return requests
1260+
}
1261+
12281262
func listIngressClassRequestsForGatewayProxy(
12291263
ctx context.Context,
12301264
c client.Client,

0 commit comments

Comments
 (0)