update validation checks for EPP picker

Author: salonichf5

internal/controller/nginx/config/maps.go

@@ -189,7 +189,7 @@ func buildInferenceMaps(groups []dataplane.BackendGroup) []shared.Map {
 
 	for _, group := range groups {
 		for _, backend := range group.Backends {
-			if backend.EndpointPickerConfig == nil {
+			if backend.EndpointPickerConfig == nil || backend.EndpointPickerConfig.EndpointPickerRef == nil {
 				continue
 			}
 

internal/controller/nginx/config/servers.go

@@ -453,14 +453,18 @@ func createInternalLocationsForRule(
 			intLocation, match = initializeInternalMatchLocationWithInference(pathRuleIdx, matchRuleIdx, r.Match)
 			intInfLocation := initializeInternalInferenceRedirectLocation(pathRuleIdx, matchRuleIdx)
 			for _, b := range r.BackendGroup.Backends {
-				if b.EndpointPickerConfig != nil {
+				if b.EndpointPickerConfig != nil && b.EndpointPickerConfig.EndpointPickerRef != nil {
 					eppRef := b.EndpointPickerConfig.EndpointPickerRef
 					var portNum int
 					if eppRef.Port != nil {
 						portNum = int(eppRef.Port.Number)
 					}
 					intInfLocation.EPPInternalPath = intLocation.Path
-					intInfLocation.EPPHost = string(eppRef.Name) + "." + b.EndpointPickerConfig.NsName + svcClusterLocal
+					if b.EndpointPickerConfig.NsName != "" {
+						intInfLocation.EPPHost = string(eppRef.Name) + "." + b.EndpointPickerConfig.NsName + svcClusterLocal
+					} else {
+						intInfLocation.EPPHost = string(eppRef.Name)
+					}
 					intInfLocation.EPPPort = portNum
 				}
 			}
@@ -516,7 +520,11 @@ func createInferenceLocationsForRule(
 						portNum = int(eppRef.Port.Number)
 					}
 					extLocations[i].EPPInternalPath = intLocation.Path
-					extLocations[i].EPPHost = string(eppRef.Name) + "." + b.EndpointPickerConfig.NsName + svcClusterLocal
+					if b.EndpointPickerConfig.NsName != "" {
+						extLocations[i].EPPHost = string(eppRef.Name) + "." + b.EndpointPickerConfig.NsName + svcClusterLocal
+					} else {
+						extLocations[i].EPPHost = string(eppRef.Name)
+					}
 					extLocations[i].EPPPort = portNum
 				}
 			}

internal/controller/state/conditions/conditions.go

@@ -39,10 +39,6 @@ const (
 	// Route rules has a backendRef with an unsupported value.
 	RouteReasonBackendRefUnsupportedValue v1.RouteConditionReason = "UnsupportedValue"
 
-	// RouteReasonBackendRefInvalidInferencePool is used with the "ResolvedRefs" condition when
-	// the InferencePool backendRef is invalid.
-	RouteReasonBackendRefInvalidInferencePool v1.RouteConditionReason = "InvalidInferencePool"
-
 	// RouteReasonInvalidGateway is used with the "Accepted" (false) condition when the Gateway the Route
 	// references is invalid.
 	RouteReasonInvalidGateway v1.RouteConditionReason = "InvalidGateway"
@@ -67,6 +63,9 @@ const (
 	// invalid. Used with ResolvedRefs (false).
 	RouteReasonInvalidFilter v1.RouteConditionReason = "InvalidFilter"
 
+	// RouteReasonInvalidInferencePool is used when a InferencePool backendRef referenced by a Route is invalid.
+	RouteReasonInvalidInferencePool v1.RouteConditionReason = "InvalidInferencePool"
+
 	// GatewayReasonUnsupportedValue is used with GatewayConditionAccepted (false) when a value of a field in a Gateway
 	// is invalid or not supported.
 	GatewayReasonUnsupportedValue v1.GatewayConditionReason = "UnsupportedValue"
@@ -456,7 +455,7 @@ func NewRouteBackendRefInvalidInferencePool(msg string) Condition {
 	return Condition{
 		Type:    string(v1.RouteConditionResolvedRefs),
 		Status:  metav1.ConditionFalse,
-		Reason:  string(RouteReasonBackendRefInvalidInferencePool),
+		Reason:  string(RouteReasonInvalidInferencePool),
 		Message: msg,
 	}
 }

internal/controller/state/dataplane/configuration.go

@@ -394,15 +394,20 @@ func newBackendGroup(
 
 		inferencePoolBackendExists = inferencePoolBackendExists || ref.IsInferencePool
 
-		backends = append(backends, Backend{
-			UpstreamName: ref.ServicePortReference(),
-			Weight:       ref.Weight,
-			Valid:        valid,
-			VerifyTLS:    convertBackendTLS(ref.BackendTLSPolicy, gatewayName),
-			EndpointPickerConfig: &EndpointPickerConfig{
-				NsName:            ref.EndpointPickerConfig.NsName,
+		var eppRef *EndpointPickerConfig
+		if ref.EndpointPickerConfig.EndpointPickerRef != nil {
+			eppRef = &EndpointPickerConfig{
 				EndpointPickerRef: ref.EndpointPickerConfig.EndpointPickerRef,
-			},
+				NsName:            ref.EndpointPickerConfig.NsName,
+			}
+		}
+
+		backends = append(backends, Backend{
+			UpstreamName:         ref.ServicePortReference(),
+			Weight:               ref.Weight,
+			Valid:                valid,
+			VerifyTLS:            convertBackendTLS(ref.BackendTLSPolicy, gatewayName),
+			EndpointPickerConfig: eppRef,
 		})
 	}
 

internal/controller/state/graph/backend_refs.go

@@ -123,7 +123,6 @@ func addBackendRefsToRules(
 
 				if pool, exists := referencedInferencePools[poolName]; exists {
 					// If the InferencePool is invalid, add a condition to the route
-					// and set the port to nil to avoid generating backendRefs for it.
 					if !pool.Valid {
 						route.Conditions = append(route.Conditions, conditions.NewRouteBackendRefInvalidInferencePool(
 							fmt.Sprintf("Referenced InferencePool %s/%s is invalid",
@@ -133,7 +132,6 @@ func addBackendRefsToRules(
 						))
 						continue
 					}
-
 					port := gatewayv1.PortNumber(pool.Source.Spec.TargetPorts[0].Number)
 					ref.Port = helpers.GetPointer(port)
 					ref.EndpointPickerConfig.EndpointPickerRef = &pool.Source.Spec.EndpointPickerRef
@@ -199,7 +197,9 @@ func createBackendRef(
 		refPath,
 	)
 
-	if !valid {
+	validBackendRef := valid && len(route.Conditions) == 0
+
+	if !validBackendRef {
 		backendRef := BackendRef{
 			Weight:               weight,
 			Valid:                false,

internal/controller/state/graph/route_common.go

@@ -177,8 +177,10 @@ type RouteBackendRef struct {
 
 // EndpointPickerConfig specifies the namespace and reference to the EndpointPicker extension.
 type EndpointPickerConfig struct {
+	// EndpointPickerRef is the reference to the EndpointPicker.
 	EndpointPickerRef *inference.EndpointPickerRef
-	NsName            string
+	// NsName is the namespace of the EndpointPicker.
+	NsName string
 }
 
 // CreateRouteKey takes a client.Object and creates a RouteKey.