Fix conditions

Author: tataruty

internal/controller/state/conditions/conditions.go

@@ -42,10 +42,6 @@ const (
 	// not yet supported.
 	RouteReasonUnsupportedField v1.RouteConditionReason = "UnsupportedField"
 
-	// RouteConditionUnsupportedField indicates that the Route contains fields that are not yet supported.
-	// The route is still valid and processed, but these fields are ignored.
-	RouteConditionUnsupportedField v1.RouteConditionType = "UnsupportedField"
-
 	// RouteReasonInvalidGateway is used with the "Accepted" (false) condition when the Gateway the Route
 	// references is invalid.
 	RouteReasonInvalidGateway v1.RouteConditionReason = "InvalidGateway"
@@ -74,10 +70,6 @@ const (
 	// that are not yet supported.
 	GatewayReasonUnsupportedField v1.GatewayConditionReason = "UnsupportedField"
 
-	// GatewayConditionUnsupportedField indicates that the Gateway contains fields that are not yet supported.
-	// The gateway is still valid and processed, but these fields are ignored.
-	GatewayConditionUnsupportedField v1.GatewayConditionType = "UnsupportedField"
-
 	// GatewayReasonUnsupportedValue is used with GatewayConditionAccepted (false) when a value of a field in a Gateway
 	// is invalid or not supported.
 	GatewayReasonUnsupportedValue v1.GatewayConditionReason = "UnsupportedValue"
@@ -370,10 +362,11 @@ func NewRouteUnsupportedValue(msg string) Condition {
 	}
 }
 
-// NewRouteUnsupportedField returns a Condition that indicates that the Route includes an unsupported field.
-func NewRouteUnsupportedField(msg string) Condition {
+// NewRouteAcceptedUnsupportedField returns a Condition that indicates that the Route is accepted but
+// includes an unsupported field.
+func NewRouteAcceptedUnsupportedField(msg string) Condition {
 	return Condition{
-		Type:    string(RouteConditionUnsupportedField),
+		Type:    string(v1.RouteConditionAccepted),
 		Status:  metav1.ConditionTrue,
 		Reason:  string(RouteReasonUnsupportedField),
 		Message: fmt.Sprintf("The following unsupported parameters were ignored: %s", msg),
@@ -971,11 +964,11 @@ func NewGatewayInvalidParameters(msg string) Condition {
 	}
 }
 
-// NewGatewayUnsupportedField returns a Condition that indicates the Gateway is accepted but
+// NewGatewayAcceptedUnsupportedField returns a Condition that indicates the Gateway is accepted but
 // contains a field that is not supported.
-func NewGatewayUnsupportedField(msg string) Condition {
+func NewGatewayAcceptedUnsupportedField(msg string) Condition {
 	return Condition{
-		Type:    string(GatewayConditionUnsupportedField),
+		Type:    string(v1.GatewayConditionAccepted),
 		Status:  metav1.ConditionTrue,
 		Reason:  string(GatewayReasonUnsupportedField),
 		Message: fmt.Sprintf("Gateway accepted but the following unsupported parameters were ignored: %s", msg),

internal/controller/state/graph/gateway.go

@@ -275,11 +275,11 @@ func validateUnsupportedGatewayFields(gw *v1.Gateway) []conditions.Condition {
 	var conds []conditions.Condition
 
 	if gw.Spec.AllowedListeners != nil {
-		conds = append(conds, conditions.NewGatewayUnsupportedField("AllowedListeners"))
+		conds = append(conds, conditions.NewGatewayAcceptedUnsupportedField("AllowedListeners"))
 	}
 
 	if gw.Spec.BackendTLS != nil {
-		conds = append(conds, conditions.NewGatewayUnsupportedField("BackendTLS"))
+		conds = append(conds, conditions.NewGatewayAcceptedUnsupportedField("BackendTLS"))
 	}
 
 	return conds

internal/controller/state/graph/gateway_test.go

@@ -1561,7 +1561,7 @@ func TestBuildGateway(t *testing.T) {
 						},
 					},
 					Conditions: []conditions.Condition{
-						conditions.NewGatewayUnsupportedField("AllowedListeners"),
+						conditions.NewGatewayAcceptedUnsupportedField("AllowedListeners"),
 						conditions.NewGatewayResolvedRefs(),
 					},
 				},
@@ -1603,7 +1603,7 @@ func TestBuildGateway(t *testing.T) {
 						IPFamily: helpers.GetPointer(ngfAPIv1alpha2.Dual),
 					},
 					Conditions: []conditions.Condition{
-						conditions.NewGatewayUnsupportedField("BackendTLS"),
+						conditions.NewGatewayAcceptedUnsupportedField("BackendTLS"),
 						conditions.NewGatewayRefInvalid(
 							"spec.infrastructure.parametersRef.kind: Unsupported value: \"wrong-kind\": supported values: \"NginxProxy\"",
 						),
@@ -1946,7 +1946,7 @@ func TestValidateUnsupportedGatewayFields(t *testing.T) {
 				},
 			},
 			expectedConds: []conditions.Condition{
-				conditions.NewGatewayUnsupportedField("AllowedListeners"),
+				conditions.NewGatewayAcceptedUnsupportedField("AllowedListeners"),
 			},
 		},
 		{
@@ -1958,8 +1958,8 @@ func TestValidateUnsupportedGatewayFields(t *testing.T) {
 				},
 			},
 			expectedConds: []conditions.Condition{
-				conditions.NewGatewayUnsupportedField("AllowedListeners"),
-				conditions.NewGatewayUnsupportedField("BackendTLS"),
+				conditions.NewGatewayAcceptedUnsupportedField("AllowedListeners"),
+				conditions.NewGatewayAcceptedUnsupportedField("BackendTLS"),
 			},
 		},
 	}

internal/controller/state/graph/grpcroute.go

@@ -267,7 +267,7 @@ func processGRPCRouteRules(
 
 	// add warning condition for unsupported fields if any
 	if len(allRulesErrors.warn) > 0 {
-		conds = append(conds, conditions.NewRouteUnsupportedField(allRulesErrors.warn.ToAggregate().Error()))
+		conds = append(conds, conditions.NewRouteAcceptedUnsupportedField(allRulesErrors.warn.ToAggregate().Error()))
 	}
 
 	if len(allRulesErrors.invalid) > 0 {

internal/controller/state/graph/grpcroute_test.go

@@ -1140,7 +1140,7 @@ func TestBuildGRPCRoute(t *testing.T) {
 					},
 				},
 				Conditions: []conditions.Condition{
-					conditions.NewRouteUnsupportedField("spec.rules[0].name: Forbidden: Name"),
+					conditions.NewRouteAcceptedUnsupportedField("spec.rules[0].name: Forbidden: Name"),
 				},
 			},
 			name: "valid route with unsupported field",
@@ -1175,7 +1175,7 @@ func TestBuildGRPCRoute(t *testing.T) {
 					},
 				},
 				Conditions: []conditions.Condition{
-					conditions.NewRouteUnsupportedField("spec.rules[0].name: Forbidden: Name"),
+					conditions.NewRouteAcceptedUnsupportedField("spec.rules[0].name: Forbidden: Name"),
 					conditions.NewRouteUnsupportedValue(
 						"All rules are invalid: [spec.rules[0].matches[0].method.service: Required value: service is required, " +
 							"spec.rules[0].matches[0].method.method: Required value: method is required]",
@@ -1571,7 +1571,7 @@ func TestProcessGRPCRouteRules_UnsupportedFields(t *testing.T) {
 			},
 			expectedValid: true,
 			expectedConds: []conditions.Condition{
-				conditions.NewRouteUnsupportedField("spec.rules[0].name: Forbidden: Name"),
+				conditions.NewRouteAcceptedUnsupportedField("spec.rules[0].name: Forbidden: Name"),
 			},
 			expectedWarns: 1,
 		},
@@ -1587,7 +1587,7 @@ func TestProcessGRPCRouteRules_UnsupportedFields(t *testing.T) {
 			},
 			expectedValid: true,
 			expectedConds: []conditions.Condition{
-				conditions.NewRouteUnsupportedField("[spec.rules[0].name: Forbidden: Name, " +
+				conditions.NewRouteAcceptedUnsupportedField("[spec.rules[0].name: Forbidden: Name, " +
 					"spec.rules[0].sessionPersistence: Forbidden: SessionPersistence]"),
 			},
 			expectedWarns: 2,

internal/controller/state/graph/httproute.go

@@ -274,7 +274,7 @@ func processHTTPRouteRules(
 
 	// add warning condition for unsupported fields if any
 	if len(allRulesErrors.warn) > 0 {
-		conds = append(conds, conditions.NewRouteUnsupportedField(allRulesErrors.warn.ToAggregate().Error()))
+		conds = append(conds, conditions.NewRouteAcceptedUnsupportedField(allRulesErrors.warn.ToAggregate().Error()))
 		valid = true
 	}
 

internal/controller/state/graph/httproute_test.go

@@ -978,7 +978,7 @@ func TestBuildHTTPRoute(t *testing.T) {
 					},
 				},
 				Conditions: []conditions.Condition{
-					conditions.NewRouteUnsupportedField("spec.rules[0].name: Forbidden: Name"),
+					conditions.NewRouteAcceptedUnsupportedField("spec.rules[0].name: Forbidden: Name"),
 				},
 			},
 			name: "valid route with unsupported field",
@@ -1781,7 +1781,7 @@ func TestProcessHTTPRouteRules_UnsupportedFields(t *testing.T) {
 			},
 			expectedValid: true,
 			expectedConds: []conditions.Condition{
-				conditions.NewRouteUnsupportedField("spec.rules[0].name: Forbidden: Name"),
+				conditions.NewRouteAcceptedUnsupportedField("spec.rules[0].name: Forbidden: Name"),
 			},
 			expectedWarns: 1,
 		},
@@ -1801,7 +1801,7 @@ func TestProcessHTTPRouteRules_UnsupportedFields(t *testing.T) {
 			},
 			expectedValid: true,
 			expectedConds: []conditions.Condition{
-				conditions.NewRouteUnsupportedField("[spec.rules[0].name: Forbidden: Name, spec.rules[0].timeouts: " +
+				conditions.NewRouteAcceptedUnsupportedField("[spec.rules[0].name: Forbidden: Name, spec.rules[0].timeouts: " +
 					"Forbidden: Timeouts, spec.rules[0].retry: Forbidden: Retry, " +
 					"spec.rules[0].sessionPersistence: Forbidden: SessionPersistence]"),
 			},