Skip to content

Commit 241a4d5

Browse files
authored
fix: cannot use ingress when disabling gateway API (#388)
1 parent 19b3434 commit 241a4d5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

internal/controller/httproute_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
155155
if err := r.Get(ctx, req.NamespacedName, hr); err != nil {
156156
if client.IgnoreNotFound(err) == nil {
157157
if err := r.updateHTTPRoutePolicyStatusOnDeleting(ctx, req.NamespacedName); err != nil {
158-
return ctrl.Result{}, err
158+
r.Log.Error(err, "failed to update HTTPRoutePolicy status on HTTPRoute deleting", "httproute", req.NamespacedName)
159159
}
160160
hr.Namespace = req.Namespace
161161
hr.Name = req.Name

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

internal/controller/ingress_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (r *IngressReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
143143
if err := r.Get(ctx, req.NamespacedName, ingress); err != nil {
144144
if client.IgnoreNotFound(err) == nil {
145145
if err := r.updateHTTPRoutePolicyStatusOnDeleting(ctx, req.NamespacedName); err != nil {
146-
return ctrl.Result{}, err
146+
r.Log.Error(err, "failed to update HTTPRoutePolicy status on Ingress deleting", "ingress", req.NamespacedName)
147147
}
148148

149149
// Ingress was deleted, clean up corresponding resources
@@ -212,7 +212,6 @@ func (r *IngressReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
212212
// process HTTPRoutePolicy
213213
if err := r.processHTTPRoutePolicies(tctx, ingress); err != nil {
214214
r.Log.Error(err, "failed to process HTTPRoutePolicy", "ingress", ingress.Name)
215-
return ctrl.Result{}, err
216215
}
217216

218217
ProcessBackendTrafficPolicy(r.Client, r.Log, tctx)

0 commit comments

Comments
 (0)