From 56cf2bf5eb9760e984341a5efd2d09153886d3ee Mon Sep 17 00:00:00 2001 From: Will Tekulve Date: Wed, 8 Jan 2025 00:36:55 -0800 Subject: [PATCH] enable ipv4 compat mode for dual stack cluster support Signed-off-by: Will Tekulve --- .../kubernetes/proxy/testdata/deployments/ipv6.yaml | 1 + internal/xds/bootstrap/bootstrap.yaml.tpl | 2 +- internal/xds/bootstrap/testdata/render/ipv6.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index cde8a785717..da324336017 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -81,6 +81,7 @@ spec: address: '::' port_value: 19001 protocol: TCP + ipv4_compat: true filter_chains: - filters: - name: envoy.filters.network.http_connection_manager diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl index e10ab4d83f0..93c074d1ec3 100644 --- a/internal/xds/bootstrap/bootstrap.yaml.tpl +++ b/internal/xds/bootstrap/bootstrap.yaml.tpl @@ -68,7 +68,7 @@ static_resources: address: '{{ .ReadyServer.Address }}' port_value: {{ .ReadyServer.Port }} protocol: TCP - {{- if eq .IPFamily "DualStack"}} + {{- if eq .IPFamily "DualStack" "IPv6" }} ipv4_compat: true {{- end }} filter_chains: diff --git a/internal/xds/bootstrap/testdata/render/ipv6.yaml b/internal/xds/bootstrap/testdata/render/ipv6.yaml index 63395e20f7a..ab63a3e7439 100644 --- a/internal/xds/bootstrap/testdata/render/ipv6.yaml +++ b/internal/xds/bootstrap/testdata/render/ipv6.yaml @@ -37,6 +37,7 @@ static_resources: address: '::' port_value: 19001 protocol: TCP + ipv4_compat: true filter_chains: - filters: - name: envoy.filters.network.http_connection_manager