listen on ipv4 and ipv6 localhost addrs for admin server

Relates to envoyproxy#4565 Signed-off-by: Arko Dasgupta <[email protected]>
arkodg · Nov 7, 2024 · 5e3ba7f · 5e3ba7f
1 parent 2b494e4
commit 5e3ba7f
Show file tree

Hide file tree

Showing 54 changed files with 155 additions and 101 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
@@ -15,8 +15,9 @@ envoyProxyForGatewayClass:
               path: /dev/null
           address:
             socket_address:
-              address: 127.0.0.1
+              address: ::1
               port_value: 19000
+              ipv4_compat: true
         layered_runtime:
           layers:
           - name: global_config
@@ -87,7 +88,7 @@ envoyProxyForGatewayClass:
                 - endpoint:
                     address:
                       socket_address:
-                        address: 127.0.0.1
+                        address: ::1
                         port_value: 19000
           - connect_timeout: 10s
             load_assignment:
@@ -532,7 +533,8 @@ xds:
               path: /dev/null
           address:
             socketAddress:
-              address: 127.0.0.1
+              address: ::1
+              ipv4Compat: true
               portValue: 19000
         dynamicResources:
           adsConfig:
@@ -572,7 +574,7 @@ xds:
                 - endpoint:
                     address:
                       socketAddress:
-                        address: 127.0.0.1
+                        address: ::1
                         portValue: 19000
             name: prometheus_stats
             type: STATIC

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
@@ -17,7 +17,8 @@
               ],
               "address": {
                 "socketAddress": {
-                  "address": "127.0.0.1",
+                  "address": "::1",
+                  "ipv4Compat": true,
                   "portValue": 19000
                 }
               }
@@ -81,7 +82,7 @@
                             "endpoint": {
                               "address": {
                                 "socketAddress": {
-                                  "address": "127.0.0.1",
+                                  "address": "::1",
                                   "portValue": 19000
                                 }
                               }

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
@@ -11,7 +11,8 @@ xds:
               path: /dev/null
           address:
             socketAddress:
-              address: 127.0.0.1
+              address: ::1
+              ipv4Compat: true
               portValue: 19000
         dynamicResources:
           adsConfig:
@@ -51,7 +52,7 @@ xds:
                 - endpoint:
                     address:
                       socketAddress:
-                        address: 127.0.0.1
+                        address: ::1
                         portValue: 19000
             name: prometheus_stats
             type: STATIC

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
@@ -10,7 +10,8 @@ xds:
             path: /dev/null
         address:
           socketAddress:
-            address: 127.0.0.1
+            address: ::1
+            ipv4Compat: true
             portValue: 19000
       dynamicResources:
         adsConfig:
@@ -50,7 +51,7 @@ xds:
               - endpoint:
                   address:
                     socketAddress:
-                      address: 127.0.0.1
+                      address: ::1
                       portValue: 19000
           name: prometheus_stats
           type: STATIC

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
@@ -17,7 +17,8 @@
               ],
               "address": {
                 "socketAddress": {
-                  "address": "127.0.0.1",
+                  "address": "::1",
+                  "ipv4Compat": true,
                   "portValue": 19000
                 }
               }
@@ -81,7 +82,7 @@
                             "endpoint": {
                               "address": {
                                 "socketAddress": {
-                                  "address": "127.0.0.1",
+                                  "address": "::1",
                                   "portValue": 19000
                                 }
                               }

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
@@ -11,7 +11,8 @@ xds:
               path: /dev/null
           address:
             socketAddress:
-              address: 127.0.0.1
+              address: ::1
+              ipv4Compat: true
               portValue: 19000
         dynamicResources:
           adsConfig:
@@ -51,7 +52,7 @@ xds:
                 - endpoint:
                     address:
                       socketAddress:
-                        address: 127.0.0.1
+                        address: ::1
                         portValue: 19000
             name: prometheus_stats
             type: STATIC

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
@@ -10,7 +10,8 @@ xds:
             path: /dev/null
         address:
           socketAddress:
-            address: 127.0.0.1
+            address: ::1
+            ipv4Compat: true
             portValue: 19000
       dynamicResources:
         adsConfig:
@@ -50,7 +51,7 @@ xds:
               - endpoint:
                   address:
                     socketAddress:
-                      address: 127.0.0.1
+                      address: ::1
                       portValue: 19000
           name: prometheus_stats
           type: STATIC

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
@@ -11,7 +11,8 @@ xds:
               path: /dev/null
           address:
             socketAddress:
-              address: 127.0.0.1
+              address: ::1
+              ipv4Compat: true
               portValue: 19000
         dynamicResources:
           adsConfig:
@@ -51,7 +52,7 @@ xds:
                 - endpoint:
                     address:
                       socketAddress:
-                        address: 127.0.0.1
+                        address: ::1
                         portValue: 19000
             name: prometheus_stats
             type: STATIC

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
@@ -47,8 +47,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -119,7 +120,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
@@ -42,8 +42,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
@@ -55,8 +55,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -127,7 +128,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
@@ -51,8 +51,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -123,7 +124,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml
@@ -46,8 +46,9 @@ spec:
                 path: /dev/null
             address:
               socket_address:
-                address: 127.0.0.1
+                address: ::1
                 port_value: 19000
+                ipv4_compat: true
           layered_runtime:
             layers:
             - name: global_config
@@ -118,7 +119,7 @@ spec:
                   - endpoint:
                       address:
                         socket_address:
-                          address: 127.0.0.1
+                          address: ::1
                           port_value: 19000
             - connect_timeout: 10s
               load_assignment: