xds: use IPv4Compat on ready server (envoyproxy#4798)

Signed-off-by: zirain <[email protected]>
zhaohuabing · Nov 28, 2024 · 9f9de74 · 9f9de74
1 parent f8f74b7
commit 9f9de74
Show file tree

Hide file tree

Showing 54 changed files with 162 additions and 108 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
@@ -40,12 +40,13 @@ envoyProxyForGatewayClass:
             resource_api_version: V3
         static_resources:
           listeners:
-          - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+          - name: envoy-gateway-proxy-ready-::-19001
             address:
               socket_address:
-                address: 0.0.0.0
+                address: '::'
                 port_value: 19001
                 protocol: TCP
+                ipv4_compat: true
             filter_chains:
             - filters:
               - name: envoy.filters.network.http_connection_manager
@@ -658,7 +659,8 @@ xds:
           listeners:
           - address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 19001
             filterChains:
             - filters:
@@ -689,7 +691,7 @@ xds:
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http
-            name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            name: envoy-gateway-proxy-ready-::-19001
     - '@type': type.googleapis.com/envoy.admin.v3.EndpointsConfigDump
       dynamicEndpointConfigs:
       - endpointConfig:

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
@@ -234,7 +234,8 @@
                 {
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 19001
                     }
                   },
@@ -295,7 +296,7 @@
                       ]
                     }
                   ],
-                  "name": "envoy-gateway-proxy-ready-0.0.0.0-19001"
+                  "name": "envoy-gateway-proxy-ready-::-19001"
                 }
               ]
             }

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
@@ -137,7 +137,8 @@ xds:
           listeners:
           - address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 19001
             filterChains:
             - filters:
@@ -168,7 +169,7 @@ xds:
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http
-            name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            name: envoy-gateway-proxy-ready-::-19001
     - '@type': type.googleapis.com/envoy.admin.v3.EndpointsConfigDump
       dynamicEndpointConfigs:
       - endpointConfig:

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
@@ -136,7 +136,8 @@ xds:
         listeners:
         - address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 19001
           filterChains:
           - filters:
@@ -167,4 +168,4 @@ xds:
                       route:
                         cluster: prometheus_stats
                 statPrefix: eg-ready-http
-          name: envoy-gateway-proxy-ready-0.0.0.0-19001
+          name: envoy-gateway-proxy-ready-::-19001
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
@@ -234,7 +234,8 @@
                 {
                   "address": {
                     "socketAddress": {
-                      "address": "0.0.0.0",
+                      "address": "::",
+                      "ipv4Compat": true,
                       "portValue": 19001
                     }
                   },
@@ -295,7 +296,7 @@
                       ]
                     }
                   ],
-                  "name": "envoy-gateway-proxy-ready-0.0.0.0-19001"
+                  "name": "envoy-gateway-proxy-ready-::-19001"
                 }
               ]
             }

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
@@ -137,7 +137,8 @@ xds:
           listeners:
           - address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 19001
             filterChains:
             - filters:
@@ -168,7 +169,7 @@ xds:
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http
-            name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            name: envoy-gateway-proxy-ready-::-19001
     - '@type': type.googleapis.com/envoy.admin.v3.EndpointsConfigDump
       dynamicEndpointConfigs:
       - endpointConfig:

diff --git a/...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml
@@ -136,7 +136,8 @@ xds:
         listeners:
         - address:
             socketAddress:
-              address: 0.0.0.0
+              address: '::'
+              ipv4Compat: true
               portValue: 19001
           filterChains:
           - filters:
@@ -167,4 +168,4 @@ xds:
                       route:
                         cluster: prometheus_stats
                 statPrefix: eg-ready-http
-          name: envoy-gateway-proxy-ready-0.0.0.0-19001
+          name: envoy-gateway-proxy-ready-::-19001
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
@@ -137,7 +137,8 @@ xds:
           listeners:
           - address:
               socketAddress:
-                address: 0.0.0.0
+                address: '::'
+                ipv4Compat: true
                 portValue: 19001
             filterChains:
             - filters:
@@ -168,7 +169,7 @@ xds:
                         route:
                           cluster: prometheus_stats
                   statPrefix: eg-ready-http
-            name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            name: envoy-gateway-proxy-ready-::-19001
     - '@type': type.googleapis.com/envoy.admin.v3.EndpointsConfigDump
       dynamicEndpointConfigs:
       - endpointConfig:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
@@ -72,12 +72,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
@@ -67,12 +67,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
@@ -80,12 +80,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
@@ -76,12 +76,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml
@@ -71,12 +71,13 @@ spec:
               resource_api_version: V3
           static_resources:
             listeners:
-            - name: envoy-gateway-proxy-ready-0.0.0.0-19001
+            - name: envoy-gateway-proxy-ready-::-19001
               address:
                 socket_address:
-                  address: 0.0.0.0
+                  address: '::'
                   port_value: 19001
                   protocol: TCP
+                  ipv4_compat: true
               filter_chains:
               - filters:
                 - name: envoy.filters.network.http_connection_manager