Skip to content

Commit d1c824e

Browse files
committed
resolve comments
1 parent 5bfb62b commit d1c824e

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

internal/controller/indexer/indexer.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const (
2323
IngressClassRef = "ingressClassRef"
2424
ConsumerGatewayRef = "consumerGatewayRef"
2525
PolicyTargetRefs = "targetRefs"
26-
PolicyTargetRefIng = "targetRefIng"
2726
)
2827

2928
func SetupIndexer(mgr ctrl.Manager) error {
@@ -190,16 +189,6 @@ func setupIngressIndexer(mgr ctrl.Manager) error {
190189
return err
191190
}
192191

193-
// create HTTPRoutePolicy index
194-
if err := mgr.GetFieldIndexer().IndexField(
195-
context.Background(),
196-
&v1alpha1.HTTPRoutePolicy{},
197-
PolicyTargetRefIng,
198-
IngressHTTPRouteIndexFunc,
199-
); err != nil {
200-
return err
201-
}
202-
203192
return nil
204193
}
205194

internal/controller/ingress_controller.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -409,25 +409,12 @@ func (r *IngressReconciler) listIngressesByHTTPRoutePolicy(ctx context.Context,
409409
}
410410

411411
func (r *IngressReconciler) listIngressesForGenericEvent(ctx context.Context, obj client.Object) (requests []reconcile.Request) {
412-
var namespacedNameMap = make(map[types.NamespacedName]struct{})
413-
414-
switch v := obj.(type) {
412+
switch obj.(type) {
415413
case *v1alpha1.HTTPRoutePolicy:
416-
for _, ref := range v.Spec.TargetRefs {
417-
namespacedName := types.NamespacedName{Namespace: v.GetNamespace(), Name: string(ref.Name)}
418-
if _, ok := namespacedNameMap[namespacedName]; !ok {
419-
namespacedNameMap[namespacedName] = struct{}{}
420-
if err := r.Get(ctx, namespacedName, new(networkingv1.Ingress)); err != nil {
421-
r.Log.Error(err, "failed to Get Ingress", "namespace", namespacedName.Namespace, "name", namespacedName.Name)
422-
continue
423-
}
424-
requests = append(requests, reconcile.Request{NamespacedName: namespacedName})
425-
}
426-
}
414+
return r.listIngressesByHTTPRoutePolicy(ctx, obj)
427415
default:
428416
r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to HTTPRoutePolicy")
429417
}
430-
431418
return
432419
}
433420

0 commit comments

Comments
 (0)