diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 26e42496459..cee515b7857 100644 --- 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 index a89e4bcdae3..88fb3fb7119 100644 --- 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 index fbb1df4f5b0..e51ba62ea02 100644 --- 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 index b378fdc17b5..d2060bf737b 100644 --- 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 index 6ce6ee01347..1692d048c04 100644 --- 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 index 237f0f3a4ac..0b0cc9b977f 100644 --- 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/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml index f2838d95bc9..8ba7ac0d52c 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml +++ b/internal/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 index 517f3482f9f..00c3e54d04f 100644 --- 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/cmd/envoy/shutdown_manager.go b/internal/cmd/envoy/shutdown_manager.go index 48f624bb67a..e0b8204a61d 100644 --- 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/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index b3472d7ce4a..275d2442d85 100644 --- 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 index 329cb6fcfdb..d233e9445a6 100644 --- 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 index 7fd747bfc54..e774cdeaea3 100644 --- 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 index 8de53f5399b..d4ff54cedf3 100644 --- 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 index ae4f11bf6a4..c870e3fb88a 100644 --- 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/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index fd9dad594d2..4c1b3d549d5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml +++ b/internal/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 index 44303a333ff..7430d2c3cbe 100644 --- 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 index f656e51276b..30b1428feb7 100644 --- 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 index 268a27505a6..5c8a91abae6 100644 --- 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 index de2cfc52cb5..1d60a51ec4a 100644 --- 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 index bd684b6f4d5..2dd6492d359 100644 --- 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: 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 index 924d99cee9f..89d8011b03d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.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-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index 0f6bb5dcb83..ce524288d8f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.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-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml index 69797a95a41..2f4e90bb686 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.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-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index b8cf4d12a6c..c2f817d427b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.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/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index dff786a3515..6ee779f290b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -52,8 +52,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 @@ -124,7 +125,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/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index 65079b2316e..6df914ff90e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -52,8 +52,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 @@ -124,7 +125,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/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index 88371d81d1f..a45e573a36c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.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/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index 57a62e569b5..4011fbbe45d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index e575a3f3111..8f973b85b75 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index 9b84c2b4177..2da76e87e30 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.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/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index 6300b906552..2eb694dd87b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml @@ -59,8 +59,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 @@ -131,7 +132,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/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index 269909aec48..9d3359de45d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index 5774c9dc1d2..3f5bd5c6ba8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 9f6f50940c8..2571c95206f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.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/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index 3924adc4869..e42acd535e6 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-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/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml index ce6f8b7b5de..8a8c97b1d47 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml index bc0a7e23a5a..1c7fb81f2ea 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml index 360253c560e..fed5b67bc71 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index 52ea316c857..6f7e60247b8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index 6a8cfb126be..bfd4e180b42 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index 3bdf275ce09..f73bb117579 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml @@ -50,8 +50,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 @@ -122,7 +123,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/xds/bootstrap/bootstrap.go b/internal/xds/bootstrap/bootstrap.go index e8aab4d836a..a67774b4455 100644 --- a/internal/xds/bootstrap/bootstrap.go +++ b/internal/xds/bootstrap/bootstrap.go @@ -28,7 +28,7 @@ const ( // It defaults to the Envoy Gateway Kubernetes service. envoyGatewayXdsServerHost = "envoy-gateway" // EnvoyAdminAddress is the listening address of the envoy admin interface. - EnvoyAdminAddress = "127.0.0.1" + EnvoyAdminAddress = "::1" // EnvoyAdminPort is the port used to expose admin interface. EnvoyAdminPort = 19000 // envoyAdminAccessLogPath is the path used to expose admin access log. diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index d243b7777ec..9cd4f88f8ae 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -8,6 +8,7 @@ admin: socket_address: address: {{ .AdminServer.Address }} port_value: {{ .AdminServer.Port }} + ipv4_compat: true {{- if .StatsMatcher }} stats_config: stats_matcher: diff --git a/internal/xds/bootstrap/testdata/merge/default.out.yaml b/internal/xds/bootstrap/testdata/merge/default.out.yaml index e0a187fd8bc..c7023604ff3 100644 --- a/internal/xds/bootstrap/testdata/merge/default.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/default.out.yaml @@ -7,6 +7,7 @@ admin: address: socketAddress: address: 127.0.0.1 + ipv4Compat: true portValue: 20000 dynamicResources: adsConfig: @@ -52,7 +53,7 @@ staticResources: - endpoint: address: socketAddress: - address: 127.0.0.1 + address: ::1 portValue: 19000 name: prometheus_stats type: STATIC diff --git a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml index 7fcb292368a..d51a706d1db 100644 --- a/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/merge-user-bootstrap.out.yaml @@ -6,7 +6,8 @@ admin: path: /dev/null address: socketAddress: - address: 127.0.0.1 + address: ::1 + ipv4Compat: true portValue: 8080 dynamicResources: adsConfig: @@ -46,7 +47,7 @@ staticResources: - endpoint: address: socketAddress: - address: 127.0.0.1 + address: ::1 portValue: 19000 name: prometheus_stats type: STATIC diff --git a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml index 63915cc277a..1badf06bd01 100644 --- a/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/patch-global-config.out.yaml @@ -6,7 +6,8 @@ admin: path: /dev/null address: socket_address: - address: 127.0.0.1 + address: ::1 + ipv4_compat: true port_value: 19000 dynamic_resources: ads_config: @@ -48,7 +49,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 19000 name: prometheus_stats type: STATIC diff --git a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml index 40d2392a98d..d9883dbc458 100644 --- a/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml +++ b/internal/xds/bootstrap/testdata/merge/stats_sinks.out.yaml @@ -6,7 +6,8 @@ admin: path: /dev/null address: socketAddress: - address: 127.0.0.1 + address: ::1 + ipv4Compat: true portValue: 19000 dynamicResources: adsConfig: @@ -46,7 +47,7 @@ staticResources: - endpoint: address: socketAddress: - address: 127.0.0.1 + address: ::1 portValue: 19000 name: prometheus_stats type: STATIC diff --git a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml index 23cd059a2a6..84c993b9f2f 100644 --- a/internal/xds/bootstrap/testdata/render/custom-server-port.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-server-port.yaml @@ -6,8 +6,9 @@ admin: path: /dev/null address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 2222 + ipv4_compat: true layered_runtime: layers: - name: global_config @@ -78,7 +79,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 2222 - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml index 370b66914e3..ef26a5d8561 100644 --- a/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml +++ b/internal/xds/bootstrap/testdata/render/custom-stats-matcher.yaml @@ -6,8 +6,9 @@ admin: path: /dev/null address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 19000 + ipv4_compat: true stats_config: stats_matcher: inclusion_list: @@ -89,7 +90,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 19000 - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml index 1b5be570ce3..e07cdd389e2 100644 --- a/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/disable-prometheus.yaml @@ -6,8 +6,9 @@ admin: 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/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml index 93829b713f1..9e9c7336ffd 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus-gzip-compression.yaml @@ -6,8 +6,9 @@ admin: 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 @@ -85,7 +86,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 19000 - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml index 5d17a89534f..45b99a0af34 100644 --- a/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml +++ b/internal/xds/bootstrap/testdata/render/enable-prometheus.yaml @@ -6,8 +6,9 @@ admin: 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 @@ -78,7 +79,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 19000 - connect_timeout: 10s load_assignment: diff --git a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml index 3f6c0259a7e..6b5a48525b8 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics-backendref.yaml @@ -6,8 +6,9 @@ admin: 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/xds/bootstrap/testdata/render/otel-metrics.yaml b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml index 3f6c0259a7e..6b5a48525b8 100644 --- a/internal/xds/bootstrap/testdata/render/otel-metrics.yaml +++ b/internal/xds/bootstrap/testdata/render/otel-metrics.yaml @@ -6,8 +6,9 @@ admin: 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/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml index 854b8a28988..52bc391e8fe 100644 --- a/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml +++ b/internal/xds/bootstrap/testdata/render/with-max-heap-size-bytes.yaml @@ -6,8 +6,9 @@ admin: 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 @@ -78,7 +79,7 @@ static_resources: - endpoint: address: socket_address: - address: 127.0.0.1 + address: ::1 port_value: 19000 - connect_timeout: 10s load_assignment: