Skip to content

Commit e031f47

Browse files
committed
fix: cannot use ingress when disabling gateway API
1 parent f742479 commit e031f47

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

internal/controller/httproutepolicy.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateC
4545
key = indexer.GenIndexKeyWithGK(gatewayv1.GroupName, internaltypes.KindHTTPRoute, httpRoute.GetNamespace(), httpRoute.GetName())
4646
)
4747
if err := r.List(context.Background(), &list, client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
48-
return err
48+
r.Log.Error(err, "failed to list HTTPRoutePolicies for HTTPRoute", "httproute", utils.NamespacedName(httpRoute))
49+
return nil
4950
}
5051

5152
if len(list.Items) == 0 {
@@ -109,7 +110,8 @@ func (r *HTTPRouteReconciler) updateHTTPRoutePolicyStatusOnDeleting(ctx context.
109110
key = indexer.GenIndexKeyWithGK(gatewayv1.GroupName, internaltypes.KindHTTPRoute, nn.Namespace, nn.Name)
110111
)
111112
if err := r.List(ctx, &list, client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
112-
return err
113+
r.Log.Error(err, "failed to list HTTPRoutePolicies for HTTPRoute", "httproute", nn)
114+
return nil
113115
}
114116
var (
115117
httpRoutes = make(map[types.NamespacedName]gatewayv1.HTTPRoute)
@@ -141,7 +143,8 @@ func (r *IngressReconciler) processHTTPRoutePolicies(tctx *provider.TranslateCon
141143
key = indexer.GenIndexKeyWithGK(networkingv1.GroupName, internaltypes.KindIngress, ingress.GetNamespace(), ingress.GetName())
142144
)
143145
if err := r.List(context.Background(), &list, client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
144-
return err
146+
r.Log.Error(err, "failed to list HTTPRoutePolicies for Ingress", "ingress", utils.NamespacedName(ingress))
147+
return nil
145148
}
146149

147150
if len(list.Items) == 0 {
@@ -183,7 +186,8 @@ func (r *IngressReconciler) updateHTTPRoutePolicyStatusOnDeleting(ctx context.Co
183186
key = indexer.GenIndexKeyWithGK(networkingv1.GroupName, internaltypes.KindIngress, nn.Namespace, nn.Name)
184187
)
185188
if err := r.List(ctx, &list, client.MatchingFields{indexer.PolicyTargetRefs: key}); err != nil {
186-
return err
189+
r.Log.Error(err, "failed to list HTTPRoutePolicies for Ingress", "ingress", nn)
190+
return nil
187191
}
188192
var (
189193
ingress2ParentRef = make(map[types.NamespacedName]gatewayv1.ParentReference)

internal/controller/indexer/indexer.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ func SetupIndexer(mgr ctrl.Manager) error {
8888
&networkingv1.IngressClass{}: setupIngressClassIndexer,
8989
&networkingv1beta1.IngressClass{}: setupIngressClassV1beta1Indexer,
9090
&v1alpha1.BackendTrafficPolicy{}: setupBackendTrafficPolicyIndexer,
91+
&v1alpha1.HTTPRoutePolicy{}: setHTTPRoutePolicyIndexer,
9192
} {
9293
if utils.HasAPIResource(mgr, resource) {
9394
if err := setup(mgr); err != nil {
@@ -275,7 +276,10 @@ func setupHTTPRouteIndexer(mgr ctrl.Manager) error {
275276
); err != nil {
276277
return err
277278
}
279+
return nil
280+
}
278281

282+
func setHTTPRoutePolicyIndexer(mgr ctrl.Manager) error {
279283
if err := mgr.GetFieldIndexer().IndexField(
280284
context.Background(),
281285
&v1alpha1.HTTPRoutePolicy{},
@@ -284,7 +288,6 @@ func setupHTTPRouteIndexer(mgr ctrl.Manager) error {
284288
); err != nil {
285289
return err
286290
}
287-
288291
return nil
289292
}
290293

0 commit comments

Comments
 (0)