use Ingress label to select HTTPRoutes for pruning

Signed-off-by: kahirokunn <[email protected]>

Author: kahirokunn

pkg/reconciler/ingress/fixtures_test.go

@@ -57,6 +57,7 @@ func (r HTTPRoute) Build() *gatewayapi.HTTPRoute {
 				networking.IngressClassAnnotationKey: gatewayAPIIngressClassName,
 			},
 			Labels: map[string]string{
+				networking.IngressLabelKey:    "name",
 				networking.VisibilityLabelKey: "",
 			},
 			OwnerReferences: []metav1.OwnerReference{{

pkg/reconciler/ingress/ingress.go

@@ -29,6 +29,7 @@ import (
 	"knative.dev/net-gateway-api/pkg/reconciler/ingress/config"
 	"knative.dev/net-gateway-api/pkg/reconciler/ingress/resources"
 	"knative.dev/net-gateway-api/pkg/status"
+	"knative.dev/networking/pkg/apis/networking"
 	"knative.dev/networking/pkg/apis/networking/v1alpha1"
 	ingressreconciler "knative.dev/networking/pkg/client/injection/reconciler/networking/v1alpha1/ingress"
 	"knative.dev/networking/pkg/ingress"
@@ -131,15 +132,14 @@ func (c *Reconciler) reconcileIngress(ctx context.Context, ing *v1alpha1.Ingress
 
 	// Delete HTTPRoutes that don't exist in the current Spec (i.e., tags removed and no longer referenced)
 	{
-		existingRoutes, err := c.httprouteLister.HTTPRoutes(ing.Namespace).List(labels.Everything())
+		selector := labels.SelectorFromSet(labels.Set{
+			networking.IngressLabelKey: ing.Name,
+		})
+		existingRoutes, err := c.httprouteLister.HTTPRoutes(ing.Namespace).List(selector)
 		if err != nil {
 			return fmt.Errorf("failed to list HTTPRoutes: %w", err)
 		}
 		for _, r := range existingRoutes {
-			// Don't touch routes not owned by this Ingress
-			if !metav1.IsControlledBy(r, ing) {
-				continue
-			}
 			// Not in the desired set = unnecessary
 			if !desiredRouteNames.Has(r.Name) {
 				if err := c.gwapiclient.GatewayV1().HTTPRoutes(r.Namespace).Delete(ctx, r.Name, metav1.DeleteOptions{}); err != nil && !apierrs.IsNotFound(err) {

pkg/reconciler/ingress/resources/httproute.go

@@ -204,6 +204,7 @@ func MakeHTTPRoute(
 			Name:      LongestHost(rule.Hosts),
 			Namespace: ing.Namespace,
 			Labels: kmeta.UnionMaps(ing.Labels, map[string]string{
+				networking.IngressLabelKey:    ing.Name,
 				networking.VisibilityLabelKey: visibility,
 			}),
 			Annotations: kmeta.FilterMap(ing.GetAnnotations(), func(key string) bool {