use InvalidParameters

Signed-off-by: zirain <[email protected]>
envoyproxy · Jan 17, 2025 · ec94671 · ec94671
1 parent 29959e1
commit ec94671
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go
@@ -188,21 +188,21 @@ func (t *Translator) processProxyObservability(gwCtx *GatewayContext, xdsIR *ir.
 
 	xdsIR.AccessLog, err = t.processAccessLog(envoyProxy, resources)
 	if err != nil {
-		status.UpdateGatewayListenersNotValidCondition(gwCtx.Gateway, gwapiv1.GatewayReasonInvalid, metav1.ConditionFalse,
+		status.SetGatewayAccepted(gwCtx.Gateway, false, gwapiv1.GatewayReasonInvalidParameters,
 			fmt.Sprintf("Invalid access log backendRefs: %v", err))
 		return
 	}
 
 	xdsIR.Tracing, err = t.processTracing(gwCtx.Gateway, envoyProxy, t.MergeGateways, resources)
 	if err != nil {
-		status.UpdateGatewayListenersNotValidCondition(gwCtx.Gateway, gwapiv1.GatewayReasonInvalid, metav1.ConditionFalse,
+		status.SetGatewayAccepted(gwCtx.Gateway, false, gwapiv1.GatewayReasonInvalidParameters,
 			fmt.Sprintf("Invalid tracing backendRefs: %v", err))
 		return
 	}
 
 	xdsIR.Metrics, err = t.processMetrics(envoyProxy, resources)
 	if err != nil {
-		status.UpdateGatewayListenersNotValidCondition(gwCtx.Gateway, gwapiv1.GatewayReasonInvalid, metav1.ConditionFalse,
+		status.SetGatewayAccepted(gwCtx.Gateway, false, gwapiv1.GatewayReasonInvalidParameters,
 			fmt.Sprintf("Invalid metrics backendRefs: %v", err))
 		return
 	}

diff --git a/internal/gatewayapi/status/gateway.go b/internal/gatewayapi/status/gateway.go
@@ -17,12 +17,6 @@ import (
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
-func UpdateGatewayListenersNotValidCondition(gw *gwapiv1.Gateway, reason gwapiv1.GatewayConditionReason, status metav1.ConditionStatus, msg string) *gwapiv1.Gateway {
-	cond := newCondition(string(gwapiv1.GatewayReasonListenersNotValid), status, string(reason), msg, time.Now(), gw.Generation)
-	gw.Status.Conditions = MergeConditions(gw.Status.Conditions, cond)
-	return gw
-}
-
 // SetGatewayAccepted set the status condition for the provided Gateway based on the accepted state.
 func SetGatewayAccepted(gw *gwapiv1.Gateway, accepted bool, reason gwapiv1.GatewayConditionReason, message string) *gwapiv1.Gateway {
 	status := metav1.ConditionFalse

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml
@@ -19,9 +19,9 @@ gateways:
     - lastTransitionTime: null
       message: 'Invalid access log backendRefs: Service monitoring/service-not-found
         not found'
-      reason: Invalid
+      reason: InvalidParameters
       status: "False"
-      type: ListenersNotValid
+      type: Accepted
     listeners:
     - attachedRoutes: 0
       conditions:

diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml
@@ -18,9 +18,9 @@ gateways:
     conditions:
     - lastTransitionTime: null
       message: 'Invalid access log backendRefs: invalid CEL expression: )++++'
-      reason: Invalid
+      reason: InvalidParameters
       status: "False"
-      type: ListenersNotValid
+      type: Accepted
     listeners:
     - attachedRoutes: 0
       conditions:

diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml
@@ -19,9 +19,9 @@ gateways:
     - lastTransitionTime: null
       message: 'Invalid metrics backendRefs: Service monitoring/service-not-found
         not found'
-      reason: Invalid
+      reason: InvalidParameters
       status: "False"
-      type: ListenersNotValid
+      type: Accepted
     listeners:
     - attachedRoutes: 0
       conditions:

diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml
@@ -19,9 +19,9 @@ gateways:
     - lastTransitionTime: null
       message: 'Invalid tracing backendRefs: Service monitoring/service-not-found
         not found'
-      reason: Invalid
+      reason: InvalidParameters
       status: "False"
-      type: ListenersNotValid
+      type: Accepted
     listeners:
     - attachedRoutes: 0
       conditions: