add sp config to backend ref

Author: salonichf5

internal/controller/manager.go

@@ -140,10 +140,13 @@ func StartManager(cfg config.Config) error {
 			GenericValidator:    genericValidator,
 			PolicyValidator:     policyManager,
 		},
-		EventRecorder:        recorder,
-		MustExtractGVK:       mustExtractGVK,
-		PlusSecrets:          plusSecrets,
-		ExperimentalFeatures: cfg.ExperimentalFeatures,
+		EventRecorder:  recorder,
+		MustExtractGVK: mustExtractGVK,
+		PlusSecrets:    plusSecrets,
+		FeatureFlags: graph.FeatureFlags{
+			Plus:         cfg.Plus,
+			Experimental: cfg.ExperimentalFeatures,
+		},
 	})
 
 	var handlerCollector handlerMetricsCollector = collectors.NewControllerNoopCollector()

internal/controller/nginx/config/upstreams_test.go

@@ -229,7 +229,7 @@ func TestExecuteUpstreams_NginxPlus(t *testing.T) {
 				Name:        "session-persistence",
 				Expiry:      "30m",
 				Path:        "/session",
-				SessionType: dataplane.SessionPersistenceCookie,
+				SessionType: dataplane.CookieTypeSessionPersistence,
 			},
 		},
 		{
@@ -245,7 +245,7 @@ func TestExecuteUpstreams_NginxPlus(t *testing.T) {
 				Name:        "session-persistence",
 				Expiry:      "100h",
 				Path:        "/v1/users",
-				SessionType: dataplane.SessionPersistenceCookie,
+				SessionType: dataplane.CookieTypeSessionPersistence,
 			},
 		},
 		{
@@ -259,7 +259,7 @@ func TestExecuteUpstreams_NginxPlus(t *testing.T) {
 			},
 			SessionPersistence: dataplane.SessionPersistenceConfig{
 				Name:        "session-persistence",
-				SessionType: dataplane.SessionPersistenceCookie,
+				SessionType: dataplane.CookieTypeSessionPersistence,
 			},
 		},
 	}
@@ -275,7 +275,7 @@ func TestExecuteUpstreams_NginxPlus(t *testing.T) {
 		"upstream up8-with-sp-expiry-and-path-empty": 1,
 		"upstream invalid-backend-ref":               1,
 
-		"random two least_conn;": 6,
+		"random two least_conn;": 7,
 		"ip_hash;":               1,
 
 		"zone up1 1m;":                               1,
@@ -925,7 +925,7 @@ func TestCreateUpstreamPlus(t *testing.T) {
 				SessionPersistence: dataplane.SessionPersistenceConfig{
 					Name:        "session-persistence",
 					Expiry:      "45m",
-					SessionType: dataplane.SessionPersistenceCookie,
+					SessionType: dataplane.CookieTypeSessionPersistence,
 					Path:        "/app",
 				},
 			},
@@ -942,7 +942,7 @@ func TestCreateUpstreamPlus(t *testing.T) {
 				SessionPersistence: http.UpstreamSessionPersistence{
 					Name:        "session-persistence",
 					Expiry:      "45m",
-					SessionType: string(dataplane.SessionPersistenceCookie),
+					SessionType: string(dataplane.CookieTypeSessionPersistence),
 					Path:        "/app",
 				},
 			},

internal/controller/state/change_processor.go

@@ -64,8 +64,8 @@ type ChangeProcessorConfig struct {
 	GatewayCtlrName string
 	// GatewayClassName is the name of the GatewayClass resource.
 	GatewayClassName string
-	// ExperimentalFeatures indicates if experimental features are enabled.
-	ExperimentalFeatures bool
+	// FeaturesFlags holds the feature flags for building the Graph.
+	FeatureFlags graph.FeatureFlags
 }
 
 // ChangeProcessorImpl is an implementation of ChangeProcessor.
@@ -278,7 +278,7 @@ func (c *ChangeProcessorImpl) Process() *graph.Graph {
 		c.cfg.PlusSecrets,
 		c.cfg.Validators,
 		c.cfg.Logger,
-		c.cfg.ExperimentalFeatures,
+		c.cfg.FeatureFlags,
 	)
 
 	return c.latestGraph

internal/controller/state/conditions/conditions.go

@@ -42,10 +42,6 @@ const (
 	// not yet supported.
 	RouteReasonUnsupportedField v1.RouteConditionReason = "UnsupportedField"
 
-	// RouteReasonInvalidSessionPersistence is used with the "Accepted" (true) condition when the Route
-	// contains invalid session persistence configuration.
-	RouteReasonInvalidSessionPersistence v1.RouteConditionReason = "InvalidSessionPersistence"
-
 	// RouteReasonInvalidGateway is used with the "Accepted" (false) condition when the Gateway the Route
 	// references is invalid.
 	RouteReasonInvalidGateway v1.RouteConditionReason = "InvalidGateway"
@@ -397,17 +393,6 @@ func NewRouteAcceptedUnsupportedField(msg string) Condition {
 	}
 }
 
-// NewRouteAcceptedInvalidSessionPersistenceConfiguration returns a Condition that indicates that the
-// Route is accepted but invalid session persistence configuration was ignored.
-func NewRouteAcceptedInvalidSessionPersistenceConfiguration(msg string) Condition {
-	return Condition{
-		Type:    string(v1.RouteConditionAccepted),
-		Status:  metav1.ConditionTrue,
-		Reason:  string(RouteReasonInvalidSessionPersistence),
-		Message: fmt.Sprintf("Session Persistence configuration ignored: %s", msg),
-	}
-}
-
 // NewRoutePartiallyInvalid returns a Condition that indicates that the Route contains a combination
 // of both valid and invalid rules.
 //

internal/controller/state/dataplane/configuration.go

@@ -774,12 +774,6 @@ func buildUpstreams(
 				}
 
 				for _, br := range rule.BackendRefs {
-					var spForThisBackend *graph.SessionPersistenceConfig
-					// only set session persistence for regular backends
-					if rule.SessionPersistence != nil && !br.IsMirrorBackend && !br.IsInferencePool {
-						spForThisBackend = rule.SessionPersistence
-					}
-
 					if upstream := buildUpstream(
 						ctx,
 						logger,
@@ -789,7 +783,7 @@ func buildUpstreams(
 						referencedServices,
 						uniqueUpstreams,
 						allowedAddressType,
-						spForThisBackend,
+						br.SessionPersistence,
 					); upstream != nil {
 						uniqueUpstreams[upstream.Name] = *upstream
 					}
@@ -844,7 +838,6 @@ func buildUpstream(
 	}
 
 	var errMsg string
-
 	eps, err := resolveUpstreamEndpoints(
 		ctx,
 		logger,
@@ -871,7 +864,7 @@ func buildUpstream(
 			Name:        sessionPersistence.Name,
 			Expiry:      sessionPersistence.Expiry,
 			Path:        sessionPersistence.Path,
-			SessionType: SessionPersistenceCookie,
+			SessionType: CookieTypeSessionPersistence,
 		}
 	}