debug: prevent adding endpointslices to resource tree when service routing is configured

Author: bpdohall

internal/provider/kubernetes/controller.go

@@ -406,7 +406,8 @@ func (r *gatewayAPIReconciler) processBackendRefs(ctx context.Context, gwcResour
 		switch backendRefKind {
 		case resource.KindService:
 			service := new(corev1.Service)
-			err := r.client.Get(ctx, types.NamespacedName{Namespace: string(*backendRef.Namespace), Name: string(backendRef.Name)}, service)
+			nsName := types.NamespacedName{Namespace: string(*backendRef.Namespace), Name: string(backendRef.Name)}
+			err := r.client.Get(ctx, nsName, service)
 			if err != nil {
 				r.log.Error(err, "failed to get Service", "namespace", string(*backendRef.Namespace),
 					"name", string(backendRef.Name))
@@ -416,7 +417,9 @@ func (r *gatewayAPIReconciler) processBackendRefs(ctx context.Context, gwcResour
 				r.log.Info("added Service to resource tree", "namespace", string(*backendRef.Namespace),
 					"name", string(backendRef.Name))
 			}
-			endpointSliceLabelKey = discoveryv1.LabelServiceName
+			if r.hasRouteWithEndpointRouting(&nsName) {
+				endpointSliceLabelKey = discoveryv1.LabelServiceName
+			}
 
 		case resource.KindServiceImport:
 			serviceImport := new(mcsapiv1a1.ServiceImport)
@@ -1389,17 +1392,6 @@ func (r *gatewayAPIReconciler) watchResources(ctx context.Context, mgr manager.M
 		}),
 	),}
 
-
-	// servicePredicates := []predicate.TypedPredicate[*corev1.Service]{
-	// 	predicate.NewTypedPredicateFuncs[*corev1.Service](func(svc *corev1.Service) bool {
-	// 		retVal := r.validateServiceForReconcile(svc)
-	// 		if strings.HasPrefix(svc.Namespace, "dev-blue-cloud-teleportinfra-dev") {
-	// 			r.log.Info(fmt.Sprintf("predicate -- validateServiceForReconcile=%v",retVal), "namespace", svc.Namespace, "name", svc.Name)
-	// 		}
-	// 		return retVal
-	// 	}),
-	// }
-
 	if r.namespaceLabel != nil {
 		servicePredicates = append(servicePredicates, predicate.NewTypedPredicateFuncs[*corev1.Service](func(svc *corev1.Service) bool {
 			return r.hasMatchingNamespaceLabels(svc)

internal/provider/kubernetes/predicates.go

@@ -281,27 +281,23 @@ func (r *gatewayAPIReconciler) isOIDCHMACSecret(nsName *types.NamespacedName) bo
 }
 
 // isServiceOwnedByGateway returns true if the Service belongs to a Gateway.
-func (r *gatewayAPIReconciler) isServiceOwnedByGateway(svc *corev1.Service, updateStatus bool) bool {
+func (r *gatewayAPIReconciler) isServiceOwnedByGateway(svc *corev1.Service) bool {
 	ctx := context.Background()
 	labels := svc.GetLabels()
 
 	// Check if the Service belongs to a Gateway, if so, update the Gateway status.
 	gtw := r.findOwningGateway(context.Background(), labels)
 	if gtw != nil {
-		if updateStatus {
-			r.updateGatewayStatus(gtw)
-		}
+		r.updateGatewayStatus(gtw)
 		return true
 	}
 
 	// Merged gateways will have only this label, update status of all Gateways under found GatewayClass.
 	gcName, ok := labels[gatewayapi.OwningGatewayClassLabel]
 	if ok && r.mergeGateways.Has(gcName) {
-		if updateStatus {
-			if err := r.updateStatusForGatewaysUnderGatewayClass(ctx, gcName); err != nil {
-				r.log.Info("no Gateways found under GatewayClass", "name", gcName)
-				return true
-			}
+		if err := r.updateStatusForGatewaysUnderGatewayClass(ctx, gcName); err != nil {
+			r.log.Info("no Gateways found under GatewayClass", "name", gcName)
+			return true
 		}
 		return true
 	}
@@ -324,7 +320,7 @@ func (r *gatewayAPIReconciler) validateServiceUpdateForReconcile(oldObj client.O
 		return true
 	}
 
-	if r.isServiceOwnedByGateway(newSvc, false) {
+	if r.isServiceOwnedByGateway(newSvc) {
 		return true
 	}
 
@@ -351,7 +347,7 @@ func (r *gatewayAPIReconciler) validateServiceForReconcile(obj client.Object) bo
 		return false
 	}
 
-	if r.isServiceOwnedByGateway(svc, true) {
+	if r.isServiceOwnedByGateway(svc) {
 		return false
 	}