fix ListenerSetProtocolConflict

zirain · zirain · commit f563f48bb93b · 2026-03-02T19:35:21.000+08:00
Signed-off-by: zirain &lt;zirain2009@gmail.com&gt;
diff --git a/internal/cmd/egctl/testdata/translate/in/default-resources.yaml b/internal/cmd/egctl/testdata/translate/in/default-resources.yaml
@@ -19,7 +19,7 @@ spec:
       port: 1234
     - name: udp
       protocol: UDP
-      port: 1234
+      port: 2345
     - name: tls-passthrough
       protocol: TLS
       port: 8443
diff --git a/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml b/internal/cmd/egctl/testdata/translate/in/from-gateway-api-to-xds.yaml
@@ -18,7 +18,7 @@ spec:
       port: 1234
     - name: udp
       protocol: UDP
-      port: 1234
+      port: 2345
     - name: tls-passthrough
       protocol: TLS
       port: 8443
diff --git a/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml b/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml
@@ -36,7 +36,7 @@ spec:
       port: 1234
     - name: udp
       protocol: UDP
-      port: 1234
+      port: 2345
     - name: tls-passthrough
       protocol: TLS
       port: 8443
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -211,7 +211,7 @@ gateways:
         namespaces:
           from: Same
       name: udp
-      port: 1234
+      port: 2345
       protocol: UDP
     - allowedRoutes:
         namespaces:
@@ -1502,7 +1502,7 @@ xds:
             address:
               socketAddress:
                 address: 0.0.0.0
-                portValue: 1234
+                portValue: 2345
                 protocol: UDP
             listenerFilters:
             - name: envoy.filters.udp_listener.udp_proxy
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -1446,7 +1446,7 @@
                   "address": {
                     "socketAddress": {
                       "address": "0.0.0.0",
-                      "portValue": 1234,
+                      "portValue": 2345,
                       "protocol": "UDP"
                     }
                   },
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -923,7 +923,7 @@ xds:
             address:
               socketAddress:
                 address: 0.0.0.0
-                portValue: 1234
+                portValue: 2345
                 protocol: UDP
             listenerFilters:
             - name: envoy.filters.udp_listener.udp_proxy
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml
@@ -473,7 +473,7 @@ xds:
           address:
             socketAddress:
               address: 0.0.0.0
-              portValue: 1234
+              portValue: 2345
               protocol: UDP
           listenerFilters:
           - name: envoy.filters.udp_listener.udp_proxy
diff --git a/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml b/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml
@@ -55,7 +55,7 @@ gateways:
         namespaces:
           from: Same
       name: udp
-      port: 1234
+      port: 2345
       protocol: UDP
     - allowedRoutes:
         namespaces:
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml
@@ -54,6 +54,11 @@ gateways:
         reason: ProtocolConflict
         status: "True"
         type: Conflicted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
       - lastTransitionTime: null
         message: Listener must have TLS set when protocol is TLS.
         reason: Invalid
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml
@@ -62,12 +62,12 @@ gateways:
         type: Conflicted
       - lastTransitionTime: null
         message: All listeners for a given port must use a unique hostname
-        reason: HostnameConflict
+        reason: ProtocolConflict
         status: "False"
         type: Accepted
       - lastTransitionTime: null
         message: All listeners for a given port must use a unique hostname
-        reason: HostnameConflict
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml
@@ -58,6 +58,11 @@ gateways:
         reason: ProtocolConflict
         status: "True"
         type: Conflicted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
       - lastTransitionTime: null
         message: Listener must have TLS set when protocol is HTTPS.
         reason: Invalid
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml
@@ -58,8 +58,13 @@ gateways:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: Invalid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml
@@ -58,8 +58,13 @@ gateways:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: Invalid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
diff --git a/internal/gatewayapi/testdata/listenerset-protocol-conflict.out.yaml b/internal/gatewayapi/testdata/listenerset-protocol-conflict.out.yaml
@@ -190,8 +190,13 @@ listenerSets:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: ListenersNotValid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
@@ -270,8 +275,13 @@ listenerSets:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: ListenersNotValid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
@@ -357,8 +367,13 @@ listenerSets:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: ListenersNotValid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
@@ -409,8 +424,13 @@ listenerSets:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: ListenersNotValid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
diff --git a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml
@@ -87,8 +87,13 @@ gateways:
         status: "True"
         type: Conflicted
       - lastTransitionTime: null
-        message: Listener is invalid, see other Conditions for details.
-        reason: Invalid
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
+        status: "False"
+        type: Accepted
+      - lastTransitionTime: null
+        message: All listeners for a given port must use a unique hostname
+        reason: ProtocolConflict
         status: "False"
         type: Programmed
       - lastTransitionTime: null
diff --git a/internal/gatewayapi/validate.go b/internal/gatewayapi/validate.go
@@ -734,6 +734,18 @@ func (t *Translator) validateConflictedProtocolsListeners(gateways []*GatewayCon
 						gwapiv1.ListenerReasonProtocolConflict,
 						"All listeners for a given port must use a compatible protocol",
 					)
+					listener.SetCondition(
+						gwapiv1.ListenerConditionAccepted,
+						metav1.ConditionFalse,
+						gwapiv1.ListenerReasonProtocolConflict,
+						"All listeners for a given port must use a unique hostname",
+					)
+					listener.SetCondition(
+						gwapiv1.ListenerConditionProgrammed,
+						metav1.ConditionFalse,
+						gwapiv1.ListenerReasonProtocolConflict,
+						"All listeners for a given port must use a unique hostname",
+					)
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1446,7 +1446,7 @@`
`1446`	`1446`	`"address": {`
`1447`	`1447`	`"socketAddress": {`
`1448`	`1448`	`"address": "0.0.0.0",`
`1449`		`- "portValue": 1234,`
	`1449`	`+ "portValue": 2345,`
`1450`	`1450`	`"protocol": "UDP"`
`1451`	`1451`	`}`
`1452`	`1452`	`},`