diff --git a/ADOPTERS.md b/ADOPTERS.md
deleted file mode 100644
index 5914f698e7b..00000000000
--- a/ADOPTERS.md
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-# Envoy Gateway Adopters
-
-This page contains a list of organizations who are users of Envoy Gateway, following the [definitions provided by the CNCF](https://github.com/cncf/toc/blob/main/FAQ.md#what-is-the-definition-of-an-adopter).
-
-If you would like to be included in this table, please submit a PR to this file or comment to [this issue](https://github.com/envoyproxy/gateway/issues/2781) and your information will be added.
-
-## AllFactors
-* Website https://allfactors.com
-* Category: End User
-* Environments:
-* Use Case:
- - Routing all customer traffic to our various backends. Every time a new customer signs up we dynamically add a
- route to a new hostname so Envoy Gateway is deeply integrated with our product.
-* Status: production
-* Logo: https://allfactors.com/AllFactors-Logo.svg
-
-## Tetrate
-* Website: https://www.tetrate.io
-* Category: Service Provider
-* Environments: AWS
-* Use Cases:
- - Tetrate provides Enterprise Gateway (TEG) to end users, which includes a 100% upstream distribution of Envoy Gateway, and management to deliver applications securely, authenticate user traffic, protect services with rate limiting and WAF, and integrate with your observability stack to monitor and observe activity.
-* Status: production
-* (Option) https://tetrate.io/wp-content/uploads/2023/03/tetrate-logo-dark.svg
-* (Option) Description:
-
-## Airspace Link
-* Organizatioin: Airspace Link
-* Website: https://airspacelink.com/
-* Category: End User
-* Environments: Azure
-* Use Cases:
- - Airspace Link is using Envoy Gateway to route all public APIs to Kubernetes clusters, developers are manipulating routes descriptions using agnostic manifest files, which are then automatically provisioned using Envoy Gateway.
-* Status: production
-* Logo: https://airhub.airspacelink.com/images/asl-flat-logo.png
diff --git a/api/v1alpha1/ext_proc_types.go b/api/v1alpha1/ext_proc_types.go
index cbdaf97ba45..7c4c6916bac 100644
--- a/api/v1alpha1/ext_proc_types.go
+++ b/api/v1alpha1/ext_proc_types.go
@@ -22,11 +22,21 @@ const (
)
// ProcessingModeOptions defines if headers or body should be processed by the external service
+// and which attributes are sent to the processor
type ProcessingModeOptions struct {
// Defines body processing mode
//
// +optional
Body *ExtProcBodyProcessingMode `json:"body,omitempty"`
+
+ // Defines which attributes are sent to the external processor. Envoy Gateway currently
+ // supports only the following attribute prefixes: connection, source, destination,
+ // request, response, upstream and xds.route.
+ // https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
+ //
+ // +optional
+ // +kubebuilder:validation:items:Pattern=`^(connection\.|source\.|destination\.|request\.|response\.|upstream\.|xds\.route_)[a-z_1-9]*$`
+ Attributes []string `json:"attributes,omitempty"`
}
// ExtProcProcessingMode defines if and how headers and bodies are sent to the service.
@@ -70,4 +80,28 @@ type ExtProc struct {
//
// +optional
ProcessingMode *ExtProcProcessingMode `json:"processingMode,omitempty"`
+
+ // MetadataOptions defines options related to the sending and receiving of dynamic metadata.
+ // These options define which metadata namespaces would be sent to the processor and which dynamic metadata
+ // namespaces the processor would be permitted to emit metadata to.
+ // Users can specify custom namespaces or well-known envoy metadata namespace (such as envoy.filters.http.ext_authz)
+ // documented here: https://www.envoyproxy.io/docs/envoy/latest/configuration/advanced/well_known_dynamic_metadata#well-known-dynamic-metadata
+ // Default: no metadata context is sent or received from the external processor
+ //
+ // +optional
+ MetadataOptions *ExtProcMetadataOptions `json:"metadataOptions,omitempty"`
+}
+
+// ExtProcMetadataOptions defines options related to the sending and receiving of dynamic metadata to and from the
+// external processor service
+type ExtProcMetadataOptions struct {
+ // metadata namespaces forwarded to external processor
+ //
+ // +optional
+ ForwardingNamespaces []string `json:"forwardingNamespaces,omitempty"`
+
+ // metadata namespaces updatable by external processor
+ //
+ // +optional
+ ReceivingNamespaces []string `json:"receivingNamespaces,omitempty"`
}
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
index 12f634586c6..88e3f8ca364 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1alpha1/zz_generated.deepcopy.go
@@ -2156,6 +2156,11 @@ func (in *ExtProc) DeepCopyInto(out *ExtProc) {
*out = new(ExtProcProcessingMode)
(*in).DeepCopyInto(*out)
}
+ if in.MetadataOptions != nil {
+ in, out := &in.MetadataOptions, &out.MetadataOptions
+ *out = new(ExtProcMetadataOptions)
+ (*in).DeepCopyInto(*out)
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExtProc.
@@ -2168,6 +2173,31 @@ func (in *ExtProc) DeepCopy() *ExtProc {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ExtProcMetadataOptions) DeepCopyInto(out *ExtProcMetadataOptions) {
+ *out = *in
+ if in.ForwardingNamespaces != nil {
+ in, out := &in.ForwardingNamespaces, &out.ForwardingNamespaces
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+ if in.ReceivingNamespaces != nil {
+ in, out := &in.ReceivingNamespaces, &out.ReceivingNamespaces
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExtProcMetadataOptions.
+func (in *ExtProcMetadataOptions) DeepCopy() *ExtProcMetadataOptions {
+ if in == nil {
+ return nil
+ }
+ out := new(ExtProcMetadataOptions)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ExtProcProcessingMode) DeepCopyInto(out *ExtProcProcessingMode) {
*out = *in
@@ -4124,6 +4154,11 @@ func (in *ProcessingModeOptions) DeepCopyInto(out *ProcessingModeOptions) {
*out = new(ExtProcBodyProcessingMode)
**out = **in
}
+ if in.Attributes != nil {
+ in, out := &in.Attributes, &out.Attributes
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProcessingModeOptions.
diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml
index e6cb298d3a8..47e32695f59 100644
--- a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml
+++ b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml
@@ -908,6 +908,26 @@ spec:
Default: 200ms
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
type: string
+ metadataOptions:
+ description: |-
+ MetadataOptions defines options related to the sending and receiving of dynamic metadata.
+ These options define which metadata namespaces would be sent to the processor and which dynamic metadata
+ namespaces the processor would be permitted to emit metadata to.
+ Users can specify custom namespaces or well-known envoy metadata namespace (such as envoy.filters.http.ext_authz)
+ documented here: https://www.envoyproxy.io/docs/envoy/latest/configuration/advanced/well_known_dynamic_metadata#well-known-dynamic-metadata
+ Default: no metadata context is sent or received from the external processor
+ properties:
+ forwardingNamespaces:
+ description: metadata namespaces forwarded to external processor
+ items:
+ type: string
+ type: array
+ receivingNamespaces:
+ description: metadata namespaces updatable by external processor
+ items:
+ type: string
+ type: array
+ type: object
processingMode:
description: |-
ProcessingMode defines how request and response body is processed
@@ -918,6 +938,16 @@ spec:
Defines processing mode for requests. If present, request headers are sent. Request body is processed according
to the specified mode.
properties:
+ attributes:
+ description: |-
+ Defines which attributes are sent to the external processor. Envoy Gateway currently
+ supports only the following attribute prefixes: connection, source, destination,
+ request, response, upstream and xds.route.
+ https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
+ items:
+ pattern: ^(connection\.|source\.|destination\.|request\.|response\.|upstream\.|xds\.route_)[a-z_1-9]*$
+ type: string
+ type: array
body:
description: Defines body processing mode
enum:
@@ -931,6 +961,16 @@ spec:
Defines processing mode for responses. If present, response headers are sent. Response body is processed according
to the specified mode.
properties:
+ attributes:
+ description: |-
+ Defines which attributes are sent to the external processor. Envoy Gateway currently
+ supports only the following attribute prefixes: connection, source, destination,
+ request, response, upstream and xds.route.
+ https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes
+ items:
+ pattern: ^(connection\.|source\.|destination\.|request\.|response\.|upstream\.|xds\.route_)[a-z_1-9]*$
+ type: string
+ type: array
body:
description: Defines body processing mode
enum:
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 e81c777ee74..80934209fce 100644
--- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
+++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -772,6 +772,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -791,6 +792,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -817,6 +819,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -836,6 +839,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -855,6 +859,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
index 9bb0bc2ac1c..5b6162b655f 100644
--- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
+++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
@@ -100,6 +100,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
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 96f794bb456..0cfb690977f 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
@@ -458,6 +458,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -487,6 +488,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -527,6 +529,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -556,6 +559,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -585,6 +589,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
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 e4490080e3d..124e0fd65e0 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
@@ -251,6 +251,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -270,6 +271,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -296,6 +298,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -315,6 +318,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -334,6 +338,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml
index aa348c640c9..714656cffaf 100644
--- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml
+++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml
@@ -10,6 +10,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -29,6 +30,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +57,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -74,6 +77,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -93,6 +97,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
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 a777f5cdc56..5042c9d1f03 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
@@ -350,6 +350,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -379,6 +380,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
+ "dnsLookupFamily": "V4_PREFERRED",
"dnsRefreshRate": "30s",
"lbPolicy": "LEAST_REQUEST",
"loadAssignment": {
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 c3ee0ddf26a..2644bf5babc 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
@@ -195,6 +195,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -214,6 +215,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml
index ee8af9b7c15..9fce4f70e3e 100644
--- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml
+++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml
@@ -10,6 +10,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -29,6 +30,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
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 6edf19677ad..df906c98211 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
@@ -195,6 +195,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/provider/kubernetes/status_updater.go b/internal/provider/kubernetes/status_updater.go
index 24adaedd563..ee5cbce59d2 100644
--- a/internal/provider/kubernetes/status_updater.go
+++ b/internal/provider/kubernetes/status_updater.go
@@ -7,6 +7,7 @@ package kubernetes
import (
"context"
+ "errors"
"time"
"github.com/go-logr/logr"
@@ -56,14 +57,25 @@ func (m MutatorFunc) Mutate(old client.Object) client.Object {
type UpdateHandler struct {
log logr.Logger
client client.Client
+ sendUpdates chan struct{}
updateChannel chan Update
+ writer *UpdateWriter
}
func NewUpdateHandler(log logr.Logger, client client.Client) *UpdateHandler {
+ sendUpdates := make(chan struct{})
+ updateChannel := make(chan Update, 100)
return &UpdateHandler{
log: log,
client: client,
- updateChannel: make(chan Update, 100),
+ sendUpdates: sendUpdates,
+ updateChannel: updateChannel,
+ writer: &UpdateWriter{
+ log: log,
+ enabled: sendUpdates,
+ updateChannel: updateChannel,
+ eventsBeforeEnabled: make(chan Update, 1000),
+ },
}
}
@@ -127,6 +139,10 @@ func (u *UpdateHandler) Start(ctx context.Context) error {
u.log.Info("started status update handler")
defer u.log.Info("stopped status update handler")
+ // Enable Updaters to start sending updates to this handler.
+ close(u.sendUpdates)
+ u.writer.handleEventsReceivedBeforeEnabled()
+
for {
select {
case <-ctx.Done():
@@ -142,9 +158,7 @@ func (u *UpdateHandler) Start(ctx context.Context) error {
// Writer retrieves the interface that should be used to write to the UpdateHandler.
func (u *UpdateHandler) Writer() Updater {
- return &UpdateWriter{
- updateChannel: u.updateChannel,
- }
+ return u.writer
}
// Updater describes an interface to send status updates somewhere.
@@ -154,13 +168,40 @@ type Updater interface {
// UpdateWriter takes status updates and sends these to the UpdateHandler via a channel.
type UpdateWriter struct {
+ log logr.Logger
+ enabled <-chan struct{}
updateChannel chan<- Update
+ // a temporary buffer to store events received before the Updater is enabled.
+ // These events will be sent to the update channel once the Updater is enabled.
+ eventsBeforeEnabled chan Update
}
// Send sends the given Update off to the update channel for writing by the UpdateHandler.
func (u *UpdateWriter) Send(update Update) {
// Non-blocking receive to see if we should pass along update.
- u.updateChannel <- update
+ select {
+ case <-u.enabled:
+ u.updateChannel <- update
+ default:
+ if len(u.eventsBeforeEnabled) < cap(u.eventsBeforeEnabled) {
+ u.log.Info("received a status update while disabled, storing for later", "event", update.NamespacedName)
+ u.eventsBeforeEnabled <- update
+ } else {
+ // If the buffer is full, drop the event to avoid blocking the sender.
+ u.log.Error(errors.New("dropping status update, buffer full"), "event", update.NamespacedName)
+ }
+ }
+}
+
+// handleEventsReceivedBeforeEnabled sends the events received before the Updater was enabled to the update channel.
+func (u *UpdateWriter) handleEventsReceivedBeforeEnabled() {
+ go func() {
+ for e := range u.eventsBeforeEnabled {
+ u.log.Info("sending stored status update", "event", e.NamespacedName)
+ u.updateChannel <- e
+ }
+ close(u.eventsBeforeEnabled)
+ }()
}
// isStatusEqual checks if two objects have equivalent status.
diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go
index 495640ff90a..c5064c29eef 100644
--- a/internal/xds/translator/cluster.go
+++ b/internal/xds/translator/cluster.go
@@ -84,7 +84,7 @@ func buildEndpointType(settings []*ir.DestinationSetting) EndpointType {
}
func buildXdsCluster(args *xdsClusterArgs) *clusterv3.Cluster {
- dnsLookupFamily := clusterv3.Cluster_AUTO
+ dnsLookupFamily := clusterv3.Cluster_V4_PREFERRED
if args.ipFamily != nil {
switch *args.ipFamily {
case egv1a1.IPv4:
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml
index ed3cb77ab01..b8a8e059069 100644
--- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml
+++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml
index dbfd7c8e2b2..f8ee95fc7f6 100644
--- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml
+++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml
index dbfd7c8e2b2..f8ee95fc7f6 100644
--- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml
+++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml
index 85a1bf46bac..86fb50d1d4e 100755
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml
@@ -5,6 +5,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 15s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml
index 7faf19f8bb4..090b3919f81 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml
index dae7cbc0d4a..74a6fc0bb0c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -23,6 +24,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml
index 7faf19f8bb4..090b3919f81 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml
index 7faf19f8bb4..090b3919f81 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml
index 98d56781cb2..112aa95870f 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -45,6 +47,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -69,6 +72,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -93,6 +97,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -117,6 +122,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -141,6 +147,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -165,6 +172,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -198,6 +206,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -231,6 +240,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml
index 967893fbd41..4212b175848 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -45,6 +47,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml
index 967893fbd41..4212b175848 100644
--- a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -45,6 +47,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml
index 815e3e469ea..ec8ef8e0674 100644
--- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml
index 3e81abb2f4e..8b4149cfe83 100644
--- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -73,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml
index 3e81abb2f4e..8b4149cfe83 100644
--- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -73,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml
index a5da3995b99..4b0cccf2c2c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml
index ae291870e19..611cbe7292a 100644
--- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml
index 64ef05a8795..66c3bf73ad7 100644
--- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml
index e170f954954..df23031f8bb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml
index a39d931e4d8..dd1fce78e8b 100644
--- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml
@@ -7,6 +7,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml
index 53d0ae1b88c..d1f95214f16 100644
--- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml
index f36c0f1c777..ab0b4fca62c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml
index b3601621bf2..e7ef5350995 100644
--- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml
index 7b61aaf5f37..03fa483d156 100644
--- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -39,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml
index a5da3995b99..4b0cccf2c2c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml
index db4efa180a8..79e1aed5ebe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -88,6 +92,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml
index db4efa180a8..79e1aed5ebe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -88,6 +92,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml
index 4b9e2de2200..ff9b672a1cc 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -79,6 +83,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml
index d885aaddd66..99dc8b48184 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -39,6 +41,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 15s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml
index 6fcc3830e4f..4e40762dace 100755
--- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -62,6 +65,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -86,6 +90,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -110,6 +115,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml
index 77dc55a8476..348c3693e0f 100644
--- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml
index b3601621bf2..e7ef5350995 100755
--- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml
index 754b5ae5d02..58a2b85afd9 100755
--- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml
index 1d42d3495d8..6db525c99eb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -42,6 +43,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -78,6 +80,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -111,6 +114,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -145,6 +149,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml
index 1774ac35006..41a3c942e6a 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -31,6 +32,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml
index 8256f58d447..1be553489ce 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml
index 73c0f3ee8b8..7706960228b 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml
index d552d11a437..2dc04da7256 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml
index 90ea1e3123d..c3282c53e19 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml
index d6f92da0027..d2964ca5282 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml
index 7b147f2cc9e..2ee151ece25 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml
index 7dee2fae954..758292acfcd 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -89,6 +94,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -106,6 +112,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml
index af01a8494ca..0b5a779d918 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml
index 3847b55b7e3..759c732f54a 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml
index 2e8d489ec0a..8bf69668b44 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml
index c3beb47b89f..8906cb55b30 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml
index db56b6185c5..9d7d6d0c663 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml
index 7b45637ccff..c1d3a9aedbb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml
index 7b45637ccff..c1d3a9aedbb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml
index 7b45637ccff..c1d3a9aedbb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml
index 48272f1f225..7311c3bbcbe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml
index 48272f1f225..7311c3bbcbe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml
index 03f27845ffe..929e5fb44bb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml
index 48272f1f225..7311c3bbcbe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml
index 48272f1f225..7311c3bbcbe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml
index 03f27845ffe..929e5fb44bb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml
index c3beb47b89f..8906cb55b30 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml
index f36c0f1c777..ab0b4fca62c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml
index b3601621bf2..e7ef5350995 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml
index 390c26b1ab8..aa5b2a1bb20 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml
index b3601621bf2..e7ef5350995 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml
index 49c8eebc00e..82bc9604a7d 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml
index df5e85c34f2..3aab01e6684 100755
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -62,6 +63,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml
index 2744cfc19d8..ba9cb4c4fe4 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml
index 4cfa7db1e7e..b93477f78ca 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -31,6 +32,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml
index 1b3c2957d3f..7f270a11d04 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml
index 62a8d033f04..8222dcd6ccb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml
index 2c58afdaac7..76e7c3dcb95 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -30,6 +31,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -54,6 +56,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -81,6 +84,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml
index ff1dac67640..6091e5e97b1 100755
--- a/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml
index a5da3995b99..4b0cccf2c2c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml
index f1725d0f618..cb9e6eb5d11 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml
index 009411dcdf4..2867550caba 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml
index 95dbaeaeb9d..f3998fb3b59 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml
index 4af517cab1d..30d656a16fe 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -64,6 +67,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml
index 081ef33d842..599db139ea2 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml
index 95dbaeaeb9d..f3998fb3b59 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml
index 6701b170b27..b1433b1be87 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -81,6 +85,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml
index 95dbaeaeb9d..f3998fb3b59 100644
--- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml
index 2f38dd9d3aa..290beff3671 100644
--- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml
index 6cae3947b35..e56073d06d5 100644
--- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml
index 2f38dd9d3aa..290beff3671 100644
--- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml
index 5067244aeba..3b4bde72aeb 100644
--- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -20,6 +21,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -37,6 +39,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -54,6 +57,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -71,6 +75,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -91,6 +96,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -110,6 +116,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -127,6 +134,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -146,6 +154,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -163,6 +172,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml
index f36c0f1c777..ab0b4fca62c 100644
--- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml
index 21ebdea126b..307f4cbc565 100755
--- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml
index 8d9e43d36cf..8ad066c0640 100644
--- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -89,6 +94,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml
index b98d486efea..91395a135f6 100644
--- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml
index 77dc55a8476..348c3693e0f 100644
--- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml
index 77dc55a8476..348c3693e0f 100644
--- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml
index 8d317defa13..1207329f055 100644
--- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml
index 8d317defa13..1207329f055 100644
--- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml
index ca2d3f5e3fb..9d60e8e0bed 100644
--- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml
index 52523fffbb8..cb505645ff8 100644
--- a/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
@@ -73,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml
index c5555faa87a..6c7503a8669 100644
--- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml
index dc5c30ab312..b031b37db0e 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml
index b74141720fa..a75716855d1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml
index 4eab9980691..e3f20b743ad 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -23,6 +24,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -42,6 +44,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -61,6 +64,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml
index b74141720fa..a75716855d1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml
index a2926d67edd..79e1c96f69b 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml
index a2926d67edd..79e1c96f69b 100644
--- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +58,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -72,6 +76,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml
index f4f58fe1cc9..91bbe4fa396 100644
--- a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml
index ff1dac67640..6091e5e97b1 100644
--- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml
index d5e5aeaf991..0fd3d280a1b 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml
index 394a72179b0..d0ab3efc743 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml
index 8fd985878cc..d0b09155386 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml
index 7c294e2efa3..6b6fc7289f0 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml
index 2653bb96c8d..79872344524 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml
index 122e0dad7dc..111eac1e7b2 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml
index da821625c09..f1717a49d2b 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml
index 109e9d1392c..6414d365d02 100644
--- a/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 31s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml
index 4cfa1289322..c3ef51c0b2f 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml
index 8d317defa13..1207329f055 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml
index 12088c45682..7b7149b3f33 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml
index 304574452d2..bdf3cadd2ba 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -23,6 +24,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml
index d1459afe991..4ce2f4cfdc0 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml
index f211422edc5..cc1305448af 100644
--- a/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -22,6 +23,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 15s
+ dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml
index 6090f4f8ec2..586e95fc0e9 100644
--- a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml
index 2f1ed3604e8..ae84a44c505 100644
--- a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml
index 14df838b6e6..54c7ebf435e 100644
--- a/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml
index 5d663e5665e..74800020855 100644
--- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml
index 8e3ac051015..480aca4bb47 100755
--- a/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml
+++ b/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
+ dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
diff --git a/release-notes/current.yaml b/release-notes/current.yaml
index c0f8dfc0e5b..9ec82fc249b 100644
--- a/release-notes/current.yaml
+++ b/release-notes/current.yaml
@@ -6,6 +6,7 @@ breaking changes: |
ClientTrafficPolicy previously treated an empty TLS ALPNProtocols list as being undefined and applied Envoy Gateway defaults.
An empty TLS ALPNProtocols list is now treated as user-defined disablement of the TLS ALPN extension.
Always use `::` and `IPv4Compact` enabled on dynamic listeners.
+ Use `V4_PREFERRED` instead of `V4_ONLY` by default for the cluster's `DnsLookupFamily`.
# Updates addressing vulnerabilities, security flaws, or compliance requirements.
security updates: |
@@ -13,13 +14,15 @@ security updates: |
# New features or capabilities added in this release.
new features: |
- - Added support for trusted CIDRs in the ClientIPDetectionSettings API
+ Added support for trusted CIDRs in the ClientIPDetectionSettings API
+ Added support for sending attributes to external processor in EnvoyExtensionPolicy API
# Fixes for bugs identified in previous versions.
bug fixes: |
Fixed failed to update SecurityPolicy resources with the `backendRef` field specified
Fixed Envoy rejecting TCP Listeners that have no attached TCPRoutes
Fixed xDS translation failed when oidc tokenEndpoint and jwt remoteJWKS are specified in the same SecurityPolicy and using the same hostname
+ Fixed frequent 503 errors when connecting to a Service experiencing high Pod churn
# Enhancements that improve performance.
performance improvements: |
diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md
index 80614c2645e..0b457ade6a4 100644
--- a/site/content/en/latest/api/extension_types.md
+++ b/site/content/en/latest/api/extension_types.md
@@ -1499,6 +1499,7 @@ _Appears in:_
| `messageTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.Duration)_ | false | MessageTimeout is the timeout for a response to be returned from the external processor
Default: 200ms |
| `failOpen` | _boolean_ | false | FailOpen defines if requests or responses that cannot be processed due to connectivity to the
external processor are terminated or passed-through.
Default: false |
| `processingMode` | _[ExtProcProcessingMode](#extprocprocessingmode)_ | false | ProcessingMode defines how request and response body is processed
Default: header and body are not sent to the external processor |
+| `metadataOptions` | _[ExtProcMetadataOptions](#extprocmetadataoptions)_ | false | MetadataOptions defines options related to the sending and receiving of dynamic metadata.
These options define which metadata namespaces would be sent to the processor and which dynamic metadata
namespaces the processor would be permitted to emit metadata to.
Users can specify custom namespaces or well-known envoy metadata namespace (such as envoy.filters.http.ext_authz)
documented here: https://www.envoyproxy.io/docs/envoy/latest/configuration/advanced/well_known_dynamic_metadata#well-known-dynamic-metadata
Default: no metadata context is sent or received from the external processor |
#### ExtProcBodyProcessingMode
@@ -1517,6 +1518,22 @@ _Appears in:_
| `BufferedPartial` | BufferedPartialExtBodyHeaderProcessingMode will buffer the message body in memory and send the entire body in one chunk. If the body exceeds the configured buffer limit, then the body contents up to the buffer limit will be sent.
|
+#### ExtProcMetadataOptions
+
+
+
+ExtProcMetadataOptions defines options related to the sending and receiving of dynamic metadata to and from the
+external processor service
+
+_Appears in:_
+- [ExtProc](#extproc)
+
+| Field | Type | Required | Description |
+| --- | --- | --- | --- |
+| `forwardingNamespaces` | _string array_ | false | metadata namespaces forwarded to external processor |
+| `receivingNamespaces` | _string array_ | false | metadata namespaces updatable by external processor |
+
+
#### ExtProcProcessingMode
@@ -2960,6 +2977,7 @@ _Appears in:_
ProcessingModeOptions defines if headers or body should be processed by the external service
+and which attributes are sent to the processor
_Appears in:_
- [ExtProcProcessingMode](#extprocprocessingmode)
@@ -2967,6 +2985,7 @@ _Appears in:_
| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `body` | _[ExtProcBodyProcessingMode](#extprocbodyprocessingmode)_ | false | Defines body processing mode |
+| `attributes` | _string array_ | false | Defines which attributes are sent to the external processor. Envoy Gateway currently
supports only the following attribute prefixes: connection, source, destination,
request, response, upstream and xds.route.
https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes |
#### ProviderType
diff --git a/site/content/zh/latest/api/extension_types.md b/site/content/zh/latest/api/extension_types.md
index 80614c2645e..0b457ade6a4 100644
--- a/site/content/zh/latest/api/extension_types.md
+++ b/site/content/zh/latest/api/extension_types.md
@@ -1499,6 +1499,7 @@ _Appears in:_
| `messageTimeout` | _[Duration](https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.Duration)_ | false | MessageTimeout is the timeout for a response to be returned from the external processor
Default: 200ms |
| `failOpen` | _boolean_ | false | FailOpen defines if requests or responses that cannot be processed due to connectivity to the
external processor are terminated or passed-through.
Default: false |
| `processingMode` | _[ExtProcProcessingMode](#extprocprocessingmode)_ | false | ProcessingMode defines how request and response body is processed
Default: header and body are not sent to the external processor |
+| `metadataOptions` | _[ExtProcMetadataOptions](#extprocmetadataoptions)_ | false | MetadataOptions defines options related to the sending and receiving of dynamic metadata.
These options define which metadata namespaces would be sent to the processor and which dynamic metadata
namespaces the processor would be permitted to emit metadata to.
Users can specify custom namespaces or well-known envoy metadata namespace (such as envoy.filters.http.ext_authz)
documented here: https://www.envoyproxy.io/docs/envoy/latest/configuration/advanced/well_known_dynamic_metadata#well-known-dynamic-metadata
Default: no metadata context is sent or received from the external processor |
#### ExtProcBodyProcessingMode
@@ -1517,6 +1518,22 @@ _Appears in:_
| `BufferedPartial` | BufferedPartialExtBodyHeaderProcessingMode will buffer the message body in memory and send the entire body in one chunk. If the body exceeds the configured buffer limit, then the body contents up to the buffer limit will be sent.
|
+#### ExtProcMetadataOptions
+
+
+
+ExtProcMetadataOptions defines options related to the sending and receiving of dynamic metadata to and from the
+external processor service
+
+_Appears in:_
+- [ExtProc](#extproc)
+
+| Field | Type | Required | Description |
+| --- | --- | --- | --- |
+| `forwardingNamespaces` | _string array_ | false | metadata namespaces forwarded to external processor |
+| `receivingNamespaces` | _string array_ | false | metadata namespaces updatable by external processor |
+
+
#### ExtProcProcessingMode
@@ -2960,6 +2977,7 @@ _Appears in:_
ProcessingModeOptions defines if headers or body should be processed by the external service
+and which attributes are sent to the processor
_Appears in:_
- [ExtProcProcessingMode](#extprocprocessingmode)
@@ -2967,6 +2985,7 @@ _Appears in:_
| Field | Type | Required | Description |
| --- | --- | --- | --- |
| `body` | _[ExtProcBodyProcessingMode](#extprocbodyprocessingmode)_ | false | Defines body processing mode |
+| `attributes` | _string array_ | false | Defines which attributes are sent to the external processor. Envoy Gateway currently
supports only the following attribute prefixes: connection, source, destination,
request, response, upstream and xds.route.
https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes |
#### ProviderType
diff --git a/site/data/adopters.yaml b/site/data/adopters.yaml
index 542e381d1c3..ef6bcfb8221 100644
--- a/site/data/adopters.yaml
+++ b/site/data/adopters.yaml
@@ -11,3 +11,11 @@ adopters:
logo: "/logos/airspacelink.svg"
url: "https://airspacelink.com/"
description: "Airspace Link is using Envoy Gateway to route all public APIs to Kubernetes clusters, developers are manipulating routes descriptions using agnostic manifest files, which are then automatically provisioned using Envoy Gateway."
+ - name: "Teleport"
+ logo: "/logos/teleport.svg"
+ url: "https://goteleport.com/"
+ description: "Teleport is using Envoy Gateway to manage dynamic routing for all traffic to the Teleport Cloud Platform."
+ - name: "Tencent Cloud"
+ logo: "/logos/tencent-cloud.png"
+ url: "https://www.tencentcloud.com"
+ description: "Tencent Cloud is using Envoy Gateway as a Kubernetes Cluster Network Addon to manage dynamic routing in the Tencent Kubernetes Engine."
diff --git a/site/static/logos/teleport.svg b/site/static/logos/teleport.svg
new file mode 100644
index 00000000000..ad19786b556
--- /dev/null
+++ b/site/static/logos/teleport.svg
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/site/static/logos/tencent-cloud.png b/site/static/logos/tencent-cloud.png
new file mode 100644
index 00000000000..464fad1545c
Binary files /dev/null and b/site/static/logos/tencent-cloud.png differ
diff --git a/test/cel-validation/envoyextensionpolicy_test.go b/test/cel-validation/envoyextensionpolicy_test.go
index 7c9c168df10..a1d435e55dc 100644
--- a/test/cel-validation/envoyextensionpolicy_test.go
+++ b/test/cel-validation/envoyextensionpolicy_test.go
@@ -433,6 +433,157 @@ func TestEnvoyExtensionPolicyTarget(t *testing.T) {
},
wantErrors: []string{},
},
+ {
+ desc: "ExtProc with valid attributes",
+ mutate: func(sp *egv1a1.EnvoyExtensionPolicy) {
+ sp.Spec = egv1a1.EnvoyExtensionPolicySpec{
+ ExtProc: []egv1a1.ExtProc{
+ {
+ BackendCluster: egv1a1.BackendCluster{
+ BackendRefs: []egv1a1.BackendRef{
+ {
+ BackendObjectReference: gwapiv1.BackendObjectReference{
+ Name: "grpc-proc-service",
+ Port: ptr.To(gwapiv1.PortNumber(80)),
+ },
+ },
+ },
+ },
+ ProcessingMode: &egv1a1.ExtProcProcessingMode{
+ Request: &egv1a1.ProcessingModeOptions{
+ Attributes: []string{
+ "request.path",
+ "request.url_path",
+ "request.host",
+ "request.scheme",
+ "request.method",
+ "request.headers",
+ "request.referer",
+ "request.useragent",
+ "request.time",
+ "request.id",
+ "request.protocol",
+ "request.query",
+ "request.duration",
+ "request.size",
+ "request.total_size",
+ "response.code",
+ "response.code_details",
+ "response.flags",
+ "response.grpc_status",
+ "response.headers",
+ "response.trailers",
+ "response.size",
+ "response.total_size",
+ "response.backend_latency",
+ "source.address",
+ "source.port",
+ "destination.address",
+ "destination.port",
+ },
+ },
+ Response: &egv1a1.ProcessingModeOptions{
+ Attributes: []string{
+ "connection.id",
+ "connection.mtls",
+ "connection.requested_server_name",
+ "connection.tls_version",
+ "connection.subject_local_certificate",
+ "connection.subject_peer_certificate",
+ "connection.dns_san_local_certificate",
+ "connection.dns_san_peer_certificate",
+ "connection.uri_san_local_certificate",
+ "connection.uri_san_peer_certificate",
+ "connection.sha256_peer_certificate_digest",
+ "connection.transport_failure_reason",
+ "connection.termination_details",
+ "upstream.address",
+ "upstream.port",
+ "upstream.tls_version",
+ "upstream.subject_local_certificate",
+ "upstream.subject_peer_certificate",
+ "upstream.dns_san_local_certificate",
+ "upstream.dns_san_peer_certificate",
+ "upstream.uri_san_local_certificate",
+ "upstream.uri_san_peer_certificate",
+ "upstream.sha256_peer_certificate_digest",
+ "upstream.local_address",
+ "upstream.transport_failure_reason",
+ "upstream.request_attempt_count",
+ },
+ },
+ },
+ },
+ },
+ PolicyTargetReferences: egv1a1.PolicyTargetReferences{
+ TargetRef: &gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{
+ LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{
+ Group: "gateway.networking.k8s.io",
+ Kind: "Gateway",
+ Name: "eg",
+ },
+ },
+ },
+ }
+ },
+ wantErrors: []string{},
+ },
+ {
+ desc: "ExtProc with invalid attributes",
+ mutate: func(sp *egv1a1.EnvoyExtensionPolicy) {
+ sp.Spec = egv1a1.EnvoyExtensionPolicySpec{
+ ExtProc: []egv1a1.ExtProc{
+ {
+ BackendCluster: egv1a1.BackendCluster{
+ BackendRefs: []egv1a1.BackendRef{
+ {
+ BackendObjectReference: gwapiv1.BackendObjectReference{
+ Name: "grpc-proc-service",
+ Port: ptr.To(gwapiv1.PortNumber(80)),
+ },
+ },
+ },
+ },
+ ProcessingMode: &egv1a1.ExtProcProcessingMode{
+ Request: &egv1a1.ProcessingModeOptions{
+ Attributes: []string{
+ "xds.node",
+ "metadata",
+ "filter_state",
+ "upstream_filter_state",
+ },
+ },
+ Response: &egv1a1.ProcessingModeOptions{
+ Attributes: []string{
+ "xds.node",
+ "xds.cluster",
+ "plugin_name",
+ },
+ },
+ },
+ },
+ },
+ PolicyTargetReferences: egv1a1.PolicyTargetReferences{
+ TargetRef: &gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{
+ LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{
+ Group: "gateway.networking.k8s.io",
+ Kind: "Gateway",
+ Name: "eg",
+ },
+ },
+ },
+ }
+ },
+ wantErrors: []string{
+ "spec.extProc[0].processingMode.request.attributes[0]: Invalid value: \"xds.node\": spec.extProc[0].processingMode.request.attributes[0] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ "spec.extProc[0].processingMode.request.attributes[1]: Invalid value: \"metadata\": spec.extProc[0].processingMode.request.attributes[1] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ "spec.extProc[0].processingMode.request.attributes[2]: Invalid value: \"filter_state\": spec.extProc[0].processingMode.request.attributes[2] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ "spec.extProc[0].processingMode.request.attributes[3]: Invalid value: \"upstream_filter_state\": spec.extProc[0].processingMode.request.attributes[3] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ "spec.extProc[0].processingMode.response.attributes[0]: Invalid value: \"xds.node\": spec.extProc[0].processingMode.response.attributes[0] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ "spec.extProc[0].processingMode.response.attributes[1]: Invalid value: \"xds.cluster\": spec.extProc[0].processingMode.response.attributes[1] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ "spec.extProc[0].processingMode.response.attributes[2]: Invalid value: \"plugin_name\": spec.extProc[0].processingMode.response.attributes[2] in body should match '^(connection\\.|source\\.|destination\\.|request\\.|response\\.|upstream\\.|xds\\.route_)[a-z_1-9]*$'",
+ },
+ },
}
for _, tc := range cases {