cleanup debug and comments

Author: bpdohall

internal/provider/kubernetes/controller.go

@@ -8,7 +8,6 @@ package kubernetes
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -1358,40 +1357,30 @@ func (r *gatewayAPIReconciler) watchResources(ctx context.Context, mgr manager.M
 		}
 	}
 
-// // create service predicate with additonal logic for update events
-	servicePredicateFuncs := predicate.TypedFuncs[*corev1.Service]{
-			CreateFunc: func(e event.TypedCreateEvent[*corev1.Service]) bool {
-				return true
-			},
-			UpdateFunc: func(e event.TypedUpdateEvent[*corev1.Service]) bool {
-				retVal := r.validateServiceUpdateForReconcile(e.ObjectOld, e.ObjectNew)
-				if strings.HasPrefix(e.ObjectOld.Name, "brendan") {
-					r.log.Info(fmt.Sprintf("predicate -- validateServiceUpdateForReconcile=%v",retVal), "name", e.ObjectOld.Name)
-				}
-				return retVal
-	
-			},
-			DeleteFunc: func(e event.TypedDeleteEvent[*corev1.Service]) bool {
-				return true
-			},
-			GenericFunc: func(e event.TypedGenericEvent[*corev1.Service]) bool {
-				return true
-			},
-		}
-	
+	// composable predicate functions - service updates do not require a reconcile when the
+	// service is not referenced by any endpoint-routed backend and ClusterIP is unchanged.
+	skipServiceUpdatesWithoutEndpointRouting := predicate.TypedFuncs[*corev1.Service]{
+		CreateFunc: func(e event.TypedCreateEvent[*corev1.Service]) bool {
+			return true
+		},
+		UpdateFunc: func(e event.TypedUpdateEvent[*corev1.Service]) bool {
+			return r.validateServiceUpdateForReconcile(e.ObjectOld, e.ObjectNew)
+		},
+		DeleteFunc: func(e event.TypedDeleteEvent[*corev1.Service]) bool {
+			return true
+		},
+		GenericFunc: func(e event.TypedGenericEvent[*corev1.Service]) bool {
+			return true
+		},
+	}
 
 	// Watch Service CRUDs and process affected *Route objects.
 	servicePredicates := []predicate.TypedPredicate[*corev1.Service]{predicate.And[*corev1.Service](
-		servicePredicateFuncs,
+		skipServiceUpdatesWithoutEndpointRouting,
 		predicate.NewTypedPredicateFuncs[*corev1.Service](func(svc *corev1.Service) bool {
-			validateService := r.validateServiceForReconcile(svc)
-			if strings.HasPrefix(svc.Namespace, "dev-blue-cloud-teleportinfra-dev") {
-				r.log.Info(fmt.Sprintf("predicate -- validateServiceForReconcile=%v",validateService), "namespace", svc.Namespace, "name", svc.Name)
-			}
-			return validateService
+			return r.validateServiceForReconcile(svc)
 		}),
-	),}
-
+	)}
 	if r.namespaceLabel != nil {
 		servicePredicates = append(servicePredicates, predicate.NewTypedPredicateFuncs[*corev1.Service](func(svc *corev1.Service) bool {
 			return r.hasMatchingNamespaceLabels(svc)
@@ -1828,7 +1817,6 @@ func (r *gatewayAPIReconciler) watchResources(ctx context.Context, mgr manager.M
 }
 
 func (r *gatewayAPIReconciler) enqueueClass(_ context.Context, o client.Object) []reconcile.Request {
-	r.log.Info("enqueueClass executed", "objectName", o.GetName(), "objectNamespace", o.GetNamespace(), "objectKind", o.GetObjectKind().GroupVersionKind().Kind)
 	return []reconcile.Request{{NamespacedName: types.NamespacedName{
 		Name: string(r.classController),
 	}}}

internal/provider/kubernetes/predicates.go

@@ -280,13 +280,13 @@ func (r *gatewayAPIReconciler) isOIDCHMACSecret(nsName *types.NamespacedName) bo
 	return *nsName == oidcHMACSecret
 }
 
-// isServiceOwnedByGateway returns true if the Service belongs to a Gateway.
-func (r *gatewayAPIReconciler) isServiceOwnedByGateway(svc *corev1.Service) bool {
+// validateServiceOwnedByGateway returns true if the Service belongs to a Gateway.
+func (r *gatewayAPIReconciler) validateServiceOwnedByGateway(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)
+	gtw := r.findOwningGateway(ctx, labels)
 	if gtw != nil {
 		r.updateGatewayStatus(gtw)
 		return true
@@ -306,32 +306,29 @@ func (r *gatewayAPIReconciler) isServiceOwnedByGateway(svc *corev1.Service) bool
 }
 
 // validateServiceUpdateForReconcile checks whether a Service update should trigger a reconcile.
-// Returns false when the backend does not have endpoint routing and the service of type clusterIP 
+// Returns false when the backend does not have endpoint routing and the service of type clusterIP
 // does not have a new IP address.
 func (r *gatewayAPIReconciler) validateServiceUpdateForReconcile(oldObj client.Object, newObj client.Object) bool {
 	oldSvc, ok := oldObj.(*corev1.Service)
 	if !ok {
 		r.log.Info("unexpected object type, bypassing reconciliation", "object", oldObj)
-		return true
+		return false
 	}
 	newSvc, ok := newObj.(*corev1.Service)
 	if !ok {
 		r.log.Info("unexpected object type, bypassing reconciliation", "object", newObj)
-		return true
-	}
-
-	if r.isServiceOwnedByGateway(newSvc) {
-		return true
+		return false
 	}
 
-	if (newSvc.Spec.Type != corev1.ServiceTypeClusterIP) || (oldSvc.Spec.Type != corev1.ServiceTypeClusterIP) || (newSvc.Spec.ClusterIP != oldSvc.Spec.ClusterIP) {
-		return true
+	if r.validateServiceOwnedByGateway(newSvc) {
+		return false
 	}
 
 	nsName := utils.NamespacedName(newSvc)
 	if !r.hasRouteWithEndpointRouting(&nsName) {
-		r.log.Info("validateServiceUpdateForReconcile -- Service is not referenced by backend with endpoint routing", "service", nsName)
-		return false
+		if (newSvc.Spec.Type != corev1.ServiceTypeClusterIP) || (oldSvc.Spec.Type != corev1.ServiceTypeClusterIP) || (newSvc.Spec.ClusterIP != oldSvc.Spec.ClusterIP) {
+			return false
+		}
 	}
 
 	return true
@@ -347,13 +344,12 @@ func (r *gatewayAPIReconciler) validateServiceForReconcile(obj client.Object) bo
 		return false
 	}
 
-	if r.isServiceOwnedByGateway(svc) {
+	if r.validateServiceOwnedByGateway(svc) {
 		return false
 	}
 
 	nsName := utils.NamespacedName(svc)
 	if r.isRouteReferencingBackend(&nsName) {
-		r.log.Info("validateServiceForReconcile -- Service is referenced by a Route", "service", nsName)
 		return true
 	}
 
@@ -477,9 +473,7 @@ func (r *gatewayAPIReconciler) isRouteReferencingBackend(nsName *types.Namespace
 			return false
 		}
 		if len(tlsRouteList.Items) > 0 {
-			// we don't know the old value of the service clusterIP here, so we can't avoid reconciling on service change.
 			return true
-
 		}
 	}