xds: always use :: and IPv4Compact for dynamic listener (envoypro…

…xy#4743) * enable IPv4Compact Signed-off-by: zirain <[email protected]> * fix xds test Signed-off-by: zirain <[email protected]> * release-notes Signed-off-by: zirain <[email protected]> * nit Signed-off-by: zirain <[email protected]> * gen Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> (cherry picked from commit 78da42c) Signed-off-by: Huabing Zhao <[email protected]>
zhaohuabing · Nov 22, 2024 · 222a0f2 · 222a0f2
1 parent 067efab
commit 222a0f2
Show file tree

Hide file tree

Showing 576 changed files with 1,332 additions and 812 deletions.
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -891,7 +891,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 10080
             defaultFilterChain:
               filters:
@@ -950,7 +951,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 8080
             defaultFilterChain:
               filters:
@@ -1017,7 +1019,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 1234
             filterChains:
             - filters:
@@ -1056,7 +1059,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 8443
             filterChains:
             - filterChainMatch:
@@ -1102,7 +1106,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 1234
                 protocol: UDP
             listenerFilters:

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
@@ -637,7 +637,8 @@
                   ],
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 10080
                     }
                   },
@@ -728,7 +729,8 @@
                   ],
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 8080
                     }
                   },
@@ -833,7 +835,8 @@
                   ],
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 1234
                     }
                   },
@@ -898,7 +901,8 @@
                   ],
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 8443
                     }
                   },
@@ -976,7 +980,8 @@
                   ],
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 1234,
                       "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
@@ -370,7 +370,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 10080
             defaultFilterChain:
               filters:
@@ -429,7 +430,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 8080
             defaultFilterChain:
               filters:
@@ -496,7 +498,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 1234
             filterChains:
             - filters:
@@ -535,7 +538,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 8443
             filterChains:
             - filterChainMatch:
@@ -581,7 +585,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 1234
                 protocol: UDP
             listenerFilters:

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
@@ -20,7 +20,8 @@ xds:
               path: /dev/stdout
           address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 10080
           defaultFilterChain:
             filters:
@@ -79,7 +80,8 @@ xds:
               path: /dev/stdout
           address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 8080
           defaultFilterChain:
             filters:
@@ -146,7 +148,8 @@ xds:
               path: /dev/stdout
           address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 1234
           filterChains:
           - filters:
@@ -185,7 +188,8 @@ xds:
               path: /dev/stdout
           address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 8443
           filterChains:
           - filterChainMatch:
@@ -231,7 +235,8 @@ xds:
               path: /dev/stdout
           address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 1234
               protocol: UDP
           listenerFilters:

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
@@ -460,7 +460,8 @@
                   ],
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 10080
                     }
                   },

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
@@ -265,7 +265,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 10080
             defaultFilterChain:
               filters:

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml
@@ -20,7 +20,8 @@ xds:
               path: /dev/stdout
           address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 10080
           defaultFilterChain:
             filters:

diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
@@ -227,7 +227,8 @@ xds:
                 path: /dev/stdout
             address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 10080
             defaultFilterChain:
               filters:

diff --git a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml b/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml
@@ -95,7 +95,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/cmd/envoy/shutdown_manager.go b/internal/cmd/envoy/shutdown_manager.go
@@ -171,7 +171,7 @@ func Shutdown(drainTimeout time.Duration, minDrainDuration time.Duration, exitAt
 // postEnvoyAdminAPI sends a POST request to the Envoy admin API
 func postEnvoyAdminAPI(path string) error {
 	if resp, err := http.Post(fmt.Sprintf("http://%s:%d/%s",
-		bootstrap.EnvoyAdminAddress, bootstrap.EnvoyAdminPort, path), "application/json", nil); err != nil {
+		"localhost", bootstrap.EnvoyAdminPort, path), "application/json", nil); err != nil {
 		return err
 	} else {
 		defer resp.Body.Close()
@@ -187,7 +187,7 @@ func postEnvoyAdminAPI(path string) error {
 func getTotalConnections() (*int, error) {
 	// Send request to Envoy admin API to retrieve server.total_connections stat
 	if resp, err := http.Get(fmt.Sprintf("http://%s:%d//stats?filter=^server\\.total_connections$&format=json",
-		bootstrap.EnvoyAdminAddress, bootstrap.EnvoyAdminPort)); err != nil {
+		"localhost", bootstrap.EnvoyAdminPort)); err != nil {
 		return nil, err
 	} else {
 		defer resp.Body.Close()

diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go
@@ -22,6 +22,7 @@ import (
 	"github.com/envoyproxy/gateway/internal/ir"
 	"github.com/envoyproxy/gateway/internal/utils"
 	"github.com/envoyproxy/gateway/internal/utils/naming"
+	"github.com/envoyproxy/gateway/internal/utils/net"
 )
 
 var _ ListenersTranslator = (*Translator)(nil)
@@ -99,6 +100,10 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 			if !isReady {
 				continue
 			}
+
+			// EG always use `::` and set ipv4_compact with true to support both IPv4 and IPv6
+			address := net.IPv6ListenerAddress
+
 			// Add the listener to the Xds IR
 			servicePort := &protocolPort{protocol: listener.Protocol, port: int32(listener.Port)}
 			containerPort := servicePortToContainerPort(int32(listener.Port), gateway.envoyProxy)
@@ -107,7 +112,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 				irListener := &ir.HTTPListener{
 					CoreListenerDetails: ir.CoreListenerDetails{
 						Name:     irListenerName(listener),
-						Address:  "0.0.0.0",
+						Address:  address,
 						Port:     uint32(containerPort),
 						Metadata: buildListenerMetadata(listener, gateway),
 						IPFamily: getIPFamily(gateway.envoyProxy),
@@ -134,7 +139,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 				irListener := &ir.TCPListener{
 					CoreListenerDetails: ir.CoreListenerDetails{
 						Name:     irListenerName(listener),
-						Address:  "0.0.0.0",
+						Address:  address,
 						Port:     uint32(containerPort),
 						IPFamily: getIPFamily(gateway.envoyProxy),
 					},
@@ -150,7 +155,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 				irListener := &ir.UDPListener{
 					CoreListenerDetails: ir.CoreListenerDetails{
 						Name:    irListenerName(listener),
-						Address: "0.0.0.0",
+						Address: address,
 						Port:    uint32(containerPort),
 					},
 				}

diff --git a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml
@@ -153,7 +153,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml
@@ -138,7 +138,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml
@@ -121,7 +121,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml
@@ -132,7 +132,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml
@@ -132,7 +132,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml
@@ -266,7 +266,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false
@@ -323,7 +323,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml
@@ -227,7 +227,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml
@@ -132,7 +132,7 @@ xdsIR:
       text:
       - path: /dev/stdout
     http:
-    - address: 0.0.0.0
+    - address: '::'
       hostnames:
       - '*'
       isHTTP2: false