diff --git a/api/v1alpha1/ext_auth_types.go b/api/v1alpha1/ext_auth_types.go index 0670ed4b676..faa0897e300 100644 --- a/api/v1alpha1/ext_auth_types.go +++ b/api/v1alpha1/ext_auth_types.go @@ -56,7 +56,6 @@ type ExtAuth struct { // The authorization request message is defined in // https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/external_auth.proto // +kubebuilder:validation:XValidation:message="backendRef or backendRefs needs to be set",rule="has(self.backendRef) || self.backendRefs.size() > 0" -// +kubebuilder:validation:XValidation:message="BackendRefs must be used, backendRef is not supported.",rule="!has(self.backendRef)" // +kubebuilder:validation:XValidation:message="BackendRefs only supports Service and Backend kind.",rule="has(self.backendRefs) ? self.backendRefs.all(f, f.kind == 'Service' || f.kind == 'Backend') : true" // +kubebuilder:validation:XValidation:message="BackendRefs only supports Core and gateway.envoyproxy.io group.",rule="has(self.backendRefs) ? (self.backendRefs.all(f, f.group == \"\" || f.group == 'gateway.envoyproxy.io')) : true" type GRPCExtAuthService struct { @@ -67,7 +66,6 @@ type GRPCExtAuthService struct { // HTTPExtAuthService defines the HTTP External Authorization service // // +kubebuilder:validation:XValidation:message="backendRef or backendRefs needs to be set",rule="has(self.backendRef) || self.backendRefs.size() > 0" -// +kubebuilder:validation:XValidation:message="BackendRefs must be used, backendRef is not supported.",rule="!has(self.backendRef)" // +kubebuilder:validation:XValidation:message="BackendRefs only supports Service and Backend kind.",rule="has(self.backendRefs) ? self.backendRefs.all(f, f.kind == 'Service' || f.kind == 'Backend') : true" // +kubebuilder:validation:XValidation:message="BackendRefs only supports Core and gateway.envoyproxy.io group.",rule="has(self.backendRefs) ? (self.backendRefs.all(f, f.group == \"\" || f.group == 'gateway.envoyproxy.io')) : true" type HTTPExtAuthService struct { diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_securitypolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_securitypolicies.yaml index b6a040f8c42..840c8d59d30 100644 --- a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_securitypolicies.yaml +++ b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_securitypolicies.yaml @@ -1204,8 +1204,6 @@ spec: x-kubernetes-validations: - message: backendRef or backendRefs needs to be set rule: has(self.backendRef) || self.backendRefs.size() > 0 - - message: BackendRefs must be used, backendRef is not supported. - rule: '!has(self.backendRef)' - message: BackendRefs only supports Service and Backend kind. rule: 'has(self.backendRefs) ? self.backendRefs.all(f, f.kind == ''Service'' || f.kind == ''Backend'') : true' @@ -2103,8 +2101,6 @@ spec: x-kubernetes-validations: - message: backendRef or backendRefs needs to be set rule: has(self.backendRef) || self.backendRefs.size() > 0 - - message: BackendRefs must be used, backendRef is not supported. - rule: '!has(self.backendRef)' - message: BackendRefs only supports Service and Backend kind. rule: 'has(self.backendRefs) ? self.backendRefs.all(f, f.kind == ''Service'' || f.kind == ''Backend'') : true' diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 26e42496459..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,7 +772,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -792,7 +792,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -819,7 +819,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -839,7 +839,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -859,7 +859,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -891,7 +891,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -950,7 +951,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8080 defaultFilterChain: filters: @@ -1017,7 +1019,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 1234 filterChains: - filters: @@ -1056,7 +1059,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8443 filterChains: - filterChainMatch: @@ -1102,7 +1106,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 1234 protocol: UDP listenerFilters: 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 cc99b73a833..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,7 +100,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + 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 a89e4bcdae3..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,7 +458,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -488,7 +488,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -529,7 +529,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -559,7 +559,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -589,7 +589,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -637,7 +637,8 @@ ], "address": { "socketAddress": { - "address": "0.0.0.0", + "address": "::", + "ipv4Compat": true, "portValue": 10080 } }, @@ -728,7 +729,8 @@ ], "address": { "socketAddress": { - "address": "0.0.0.0", + "address": "::", + "ipv4Compat": true, "portValue": 8080 } }, @@ -833,7 +835,8 @@ ], "address": { "socketAddress": { - "address": "0.0.0.0", + "address": "::", + "ipv4Compat": true, "portValue": 1234 } }, @@ -898,7 +901,8 @@ ], "address": { "socketAddress": { - "address": "0.0.0.0", + "address": "::", + "ipv4Compat": true, "portValue": 8443 } }, @@ -976,7 +980,8 @@ ], "address": { "socketAddress": { - "address": "0.0.0.0", + "address": "::", + "ipv4Compat": true, "portValue": 1234, "protocol": "UDP" } diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index fbb1df4f5b0..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,7 +251,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -271,7 +271,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -298,7 +298,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -318,7 +318,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -338,7 +338,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -370,7 +370,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -429,7 +430,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8080 defaultFilterChain: filters: @@ -496,7 +498,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 1234 filterChains: - filters: @@ -535,7 +538,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8443 filterChains: - filterChainMatch: @@ -581,7 +585,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 1234 protocol: UDP listenerFilters: 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 7545c4660d0..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,7 +10,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -30,7 +30,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -57,7 +57,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -77,7 +77,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -97,7 +97,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml index b6c94a95ae8..99b3a3f2cf5 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml @@ -20,7 +20,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -79,7 +80,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8080 defaultFilterChain: filters: @@ -146,7 +148,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 1234 filterChains: - filters: @@ -185,7 +188,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8443 filterChains: - filterChainMatch: @@ -231,7 +235,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 1234 protocol: UDP listenerFilters: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index 6ce6ee01347..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,7 +350,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -380,7 +380,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", - "dnsLookupFamily": "V4_ONLY", + "dnsLookupFamily": "V4_PREFERRED", "dnsRefreshRate": "30s", "lbPolicy": "LEAST_REQUEST", "loadAssignment": { @@ -460,7 +460,8 @@ ], "address": { "socketAddress": { - "address": "0.0.0.0", + "address": "::", + "ipv4Compat": true, "portValue": 10080 } }, diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index 237f0f3a4ac..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,7 +195,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -215,7 +215,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -265,7 +265,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9d93c93a8a4..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,7 +10,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -30,7 +30,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + 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.listener.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml index 347f3302124..ed90fc0e3e2 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml @@ -20,7 +20,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 517f3482f9f..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,7 +195,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -227,7 +227,8 @@ xds: path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: diff --git a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml b/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml index de96e757e8e..862c8e8b795 100644 --- a/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/cmd/envoy/shutdown_manager.go b/internal/cmd/envoy/shutdown_manager.go index 48f624bb67a..e0b8204a61d 100644 --- a/internal/cmd/envoy/shutdown_manager.go +++ b/internal/cmd/envoy/shutdown_manager.go @@ -171,7 +171,7 @@ func Shutdown(drainTimeout time.Duration, minDrainDuration time.Duration, exitAt // postEnvoyAdminAPI sends a POST request to the Envoy admin API func postEnvoyAdminAPI(path string) error { if resp, err := http.Post(fmt.Sprintf("http://%s:%d/%s", - bootstrap.EnvoyAdminAddress, bootstrap.EnvoyAdminPort, path), "application/json", nil); err != nil { + "localhost", bootstrap.EnvoyAdminPort, path), "application/json", nil); err != nil { return err } else { defer resp.Body.Close() @@ -187,7 +187,7 @@ func postEnvoyAdminAPI(path string) error { func getTotalConnections() (*int, error) { // Send request to Envoy admin API to retrieve server.total_connections stat if resp, err := http.Get(fmt.Sprintf("http://%s:%d//stats?filter=^server\\.total_connections$&format=json", - bootstrap.EnvoyAdminAddress, bootstrap.EnvoyAdminPort)); err != nil { + "localhost", bootstrap.EnvoyAdminPort)); err != nil { return nil, err } else { defer resp.Body.Close() diff --git a/internal/gatewayapi/envoyextensionpolicy.go b/internal/gatewayapi/envoyextensionpolicy.go index 9ba561f1b5d..baf0c529d93 100644 --- a/internal/gatewayapi/envoyextensionpolicy.go +++ b/internal/gatewayapi/envoyextensionpolicy.go @@ -434,7 +434,7 @@ func (t *Translator) buildExtProc( err error ) - if rd, err = t.translateExtServiceBackendRefs(policy, extProc.BackendRefs, ir.GRPC, resources, envoyProxy, extProcIdx); err != nil { + if rd, err = t.translateExtServiceBackendRefs(policy, extProc.BackendRefs, ir.GRPC, resources, envoyProxy, "extproc", extProcIdx); err != nil { return nil, err } diff --git a/internal/gatewayapi/ext_service.go b/internal/gatewayapi/ext_service.go index e7ab19036ee..39bd5aebe47 100644 --- a/internal/gatewayapi/ext_service.go +++ b/internal/gatewayapi/ext_service.go @@ -29,6 +29,7 @@ func (t *Translator) translateExtServiceBackendRefs( protocol ir.AppProtocol, resources *resource.Resources, envoyProxy *egv1a1.EnvoyProxy, + configType string, index int, // index is used to differentiate between multiple external services in the same policy ) (*ir.RouteDestination, error) { var ( @@ -66,7 +67,7 @@ func (t *Translator) translateExtServiceBackendRefs( } rs = &ir.RouteDestination{ - Name: irIndexedExtServiceDestinationName(pnn, policy.GetObjectKind().GroupVersionKind().Kind, index), + Name: irIndexedExtServiceDestinationName(pnn, policy.GetObjectKind().GroupVersionKind().Kind, configType, index), Settings: ds, } return rs, nil @@ -139,12 +140,12 @@ func (t *Translator) processExtServiceDestination( return ds, nil } -// TODO: also refer to extension type, as Wasm may also introduce destinations -func irIndexedExtServiceDestinationName(policyNamespacedName types.NamespacedName, policyKind string, idx int) string { +func irIndexedExtServiceDestinationName(policyNamespacedName types.NamespacedName, policyKind string, configType string, idx int) string { return strings.ToLower(fmt.Sprintf( - "%s/%s/%s/%d", + "%s/%s/%s/%s/%d", policyKind, policyNamespacedName.Namespace, policyNamespacedName.Name, + configType, idx)) } diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go index 30e75ad6197..71235414814 100644 --- a/internal/gatewayapi/listener.go +++ b/internal/gatewayapi/listener.go @@ -22,6 +22,7 @@ import ( "github.com/envoyproxy/gateway/internal/ir" "github.com/envoyproxy/gateway/internal/utils" "github.com/envoyproxy/gateway/internal/utils/naming" + "github.com/envoyproxy/gateway/internal/utils/net" ) var _ ListenersTranslator = (*Translator)(nil) @@ -99,6 +100,10 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource if !isReady { continue } + + // EG always use `::` and set ipv4_compact with true to support both IPv4 and IPv6 + address := net.IPv6ListenerAddress + // Add the listener to the Xds IR servicePort := &protocolPort{protocol: listener.Protocol, port: int32(listener.Port)} containerPort := servicePortToContainerPort(int32(listener.Port), gateway.envoyProxy) @@ -107,7 +112,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource irListener := &ir.HTTPListener{ CoreListenerDetails: ir.CoreListenerDetails{ Name: irListenerName(listener), - Address: "0.0.0.0", + Address: address, Port: uint32(containerPort), Metadata: buildListenerMetadata(listener, gateway), IPFamily: getIPFamily(gateway.envoyProxy), @@ -134,7 +139,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource irListener := &ir.TCPListener{ CoreListenerDetails: ir.CoreListenerDetails{ Name: irListenerName(listener), - Address: "0.0.0.0", + Address: address, Port: uint32(containerPort), IPFamily: getIPFamily(gateway.envoyProxy), }, @@ -150,7 +155,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource irListener := &ir.UDPListener{ CoreListenerDetails: ir.CoreListenerDetails{ Name: irListenerName(listener), - Address: "0.0.0.0", + Address: address, Port: uint32(containerPort), }, } diff --git a/internal/gatewayapi/securitypolicy.go b/internal/gatewayapi/securitypolicy.go index 3c2d2af31ed..3219f816da5 100644 --- a/internal/gatewayapi/securitypolicy.go +++ b/internal/gatewayapi/securitypolicy.go @@ -373,8 +373,7 @@ func (t *Translator) translateSecurityPolicyForRoute( if extAuth, err = t.buildExtAuth( policy, resources, - gtwCtx.envoyProxy, - ); err != nil { + gtwCtx.envoyProxy); err != nil { err = perr.WithMessage(err, "ExtAuth") errs = errors.Join(errs, err) } @@ -385,7 +384,7 @@ func (t *Translator) translateSecurityPolicyForRoute( if oidc, err = t.buildOIDC( policy, resources, - gtwCtx.envoyProxy); err != nil { + gtwCtx.envoyProxy); err != nil { // TODO zhaohuabing: Only the last EnvoyProxy is used err = perr.WithMessage(err, "OIDC") errs = errors.Join(errs, err) } @@ -468,8 +467,7 @@ func (t *Translator) translateSecurityPolicyForGateway( if extAuth, err = t.buildExtAuth( policy, resources, - gateway.envoyProxy, - ); err != nil { + gateway.envoyProxy); err != nil { err = perr.WithMessage(err, "ExtAuth") errs = errors.Join(errs, err) } @@ -705,7 +703,7 @@ func (t *Translator) buildOIDCProvider(policy *egv1a1.SecurityPolicy, resources } if len(provider.BackendRefs) > 0 { - if rd, err = t.translateExtServiceBackendRefs(policy, provider.BackendRefs, protocol, resources, envoyProxy, 0); err != nil { + if rd, err = t.translateExtServiceBackendRefs(policy, provider.BackendRefs, protocol, resources, envoyProxy, "oidc", 0); err != nil { return nil, err } } @@ -839,16 +837,21 @@ func (t *Translator) buildBasicAuth( }, nil } -func (t *Translator) buildExtAuth(policy *egv1a1.SecurityPolicy, resources *resource.Resources, envoyProxy *egv1a1.EnvoyProxy) (*ir.ExtAuth, error) { +func (t *Translator) buildExtAuth( + policy *egv1a1.SecurityPolicy, + resources *resource.Resources, + envoyProxy *egv1a1.EnvoyProxy, +) (*ir.ExtAuth, error) { var ( - http = policy.Spec.ExtAuth.HTTP - grpc = policy.Spec.ExtAuth.GRPC - backends *egv1a1.BackendCluster - protocol ir.AppProtocol - rd *ir.RouteDestination - authority string - err error - traffic *ir.TrafficFeatures + http = policy.Spec.ExtAuth.HTTP + grpc = policy.Spec.ExtAuth.GRPC + backendRefs []egv1a1.BackendRef + backendSettings *egv1a1.ClusterSettings + protocol ir.AppProtocol + rd *ir.RouteDestination + authority string + err error + traffic *ir.TrafficFeatures ) // These are sanity checks, they should never happen because the API server @@ -861,18 +864,42 @@ func (t *Translator) buildExtAuth(policy *egv1a1.SecurityPolicy, resources *reso switch { case http != nil: - backends = &http.BackendCluster protocol = ir.HTTP + switch { + case len(http.BackendRefs) > 0: + backendRefs = http.BackendCluster.BackendRefs + case http.BackendRef != nil: + backendRefs = []egv1a1.BackendRef{ + { + BackendObjectReference: *http.BackendRef, + }, + } + default: + // This is a sanity check, it should never happen because the API server should have caught it + return nil, errors.New("http backend refs must be specified") + } case grpc != nil: - backends = &grpc.BackendCluster protocol = ir.GRPC + switch { + case len(grpc.BackendCluster.BackendRefs) > 0: + backendRefs = grpc.BackendRefs + case grpc.BackendRef != nil: + backendRefs = []egv1a1.BackendRef{ + { + BackendObjectReference: *grpc.BackendRef, + }, + } + default: + // This is a sanity check, it should never happen because the API server should have caught it + return nil, errors.New("grpc backend refs must be specified") + } } - if rd, err = t.translateExtServiceBackendRefs(policy, backends.BackendRefs, protocol, resources, envoyProxy, 0); err != nil { + if rd, err = t.translateExtServiceBackendRefs(policy, backendRefs, protocol, resources, envoyProxy, "extauth", 0); err != nil { return nil, err } - for _, backendRef := range backends.BackendRefs { + for _, backendRef := range backendRefs { // Authority is the calculated hostname that will be used as the Authority header. // If there are multiple backend referenced, simply use the first one - there are no good answers here. // When translated to XDS, the authority is used on the filter level not on the cluster level. @@ -882,7 +909,7 @@ func (t *Translator) buildExtAuth(policy *egv1a1.SecurityPolicy, resources *reso } } - if traffic, err = translateTrafficFeatures(backends.BackendSettings); err != nil { + if traffic, err = translateTrafficFeatures(backendSettings); err != nil { return nil, err } extAuth := &ir.ExtAuth{ diff --git a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml index 49d35c60700..496795222d9 100644 --- a/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/backend-invalid-feature-disabled.out.yaml @@ -153,7 +153,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml index 74bd61795fe..94b4d02065d 100644 --- a/internal/gatewayapi/testdata/backend-with-fallback.out.yaml +++ b/internal/gatewayapi/testdata/backend-with-fallback.out.yaml @@ -138,7 +138,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml index fde390c7efe..7d776a1784f 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-across-ns.out.yaml @@ -121,7 +121,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml index a5b87b3fa1f..a65ea66d0ab 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only-secret.out.yaml @@ -132,7 +132,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml index 8489f047341..f85b9c73c3f 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml @@ -132,7 +132,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml index 9f4874f90f4..3467422f204 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns-targetrefs.out.yaml @@ -266,7 +266,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -323,7 +323,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml index 2e2186879f9..c8898169624 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml @@ -227,7 +227,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml index 100efbcab4f..cb968f9a6a0 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml @@ -132,7 +132,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml index 8ecd25a2418..207713455e8 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-multiple-targets.out.yaml @@ -174,7 +174,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml index f91dc4d768e..8438c8551ce 100644 --- a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml +++ b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml @@ -129,7 +129,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml index bb171e01da7..b64b9faa39a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-out-of-range-error.out.yaml @@ -249,7 +249,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -292,7 +292,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml index 654c9bdab4a..b0b46e91d66 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit-with-invalid-value.out.yaml @@ -249,7 +249,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -292,7 +292,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml index d95c8a0fcc0..0db555c1cfd 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-buffer-limit.out.yaml @@ -249,7 +249,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -292,7 +292,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml index 8aafd70c0bb..a956f1b4706 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml @@ -272,7 +272,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml index 1a054712d80..1e671f11044 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml @@ -521,7 +521,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -540,7 +540,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -578,7 +578,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -612,6 +612,6 @@ xdsIR: name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/* traffic: {} tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-2/tcp port: 10053 diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml index 02222719f3f..b263c244b51 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml @@ -329,7 +329,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -373,7 +373,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml index 0a13771f373..678fc4dea50 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml @@ -127,7 +127,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml index 2b49ea23741..80a166ac5d5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml @@ -311,7 +311,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -349,7 +349,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml index 575bfca2e1b..a1cf0fa2af5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml @@ -253,7 +253,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -296,7 +296,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml index 12bbf12dbe7..04202343698 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-dns-settings.out.yaml @@ -318,7 +318,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -362,7 +362,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml index 4f964492673..792b473aba5 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml @@ -678,7 +678,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -787,7 +787,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml index 35dbb164bf1..ca5371fc7df 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-http2.out.yaml @@ -251,7 +251,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -293,7 +293,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml index 245739ca233..371a3709c9f 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-httproute-timeout.out.yaml @@ -130,7 +130,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml index dc2ba7fb3d3..0562588ff18 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer-invalid-consistent-hash-table-size.out.yaml @@ -201,7 +201,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml index b2378edf754..30918a9739b 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml @@ -421,7 +421,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -460,7 +460,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml index d64aea61aee..bc398deeace 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml @@ -150,7 +150,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml index 0be116e1ebf..3097821b6ae 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml @@ -154,7 +154,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml index 21cae9b09f3..f4b263b7c99 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml @@ -150,7 +150,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml index 0fd1f442bd8..f92bea8d0ca 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml @@ -157,7 +157,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml index f05856b9630..5f212860b63 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml @@ -153,7 +153,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml index c65df985ac5..46398f5452d 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml @@ -245,7 +245,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -284,7 +284,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml index 4ea1623c867..75e47abd4ec 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-distinct-invert.out.yaml @@ -134,7 +134,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml index 8b20cbc59c9..a19a2ed3b72 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml @@ -136,7 +136,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml index 07fa997e109..37763d7d92c 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml @@ -268,7 +268,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -321,7 +321,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml index c1542d9caec..8001e10e433 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override-invalid-valueref.out.yaml @@ -294,7 +294,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -332,7 +332,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml index 568a57af484..4f0f13c6740 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-response-override.out.yaml @@ -293,7 +293,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -353,7 +353,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml index 40ae88b602d..2ae6a02c282 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml @@ -264,7 +264,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -310,7 +310,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml index d032b952236..e8d3d65ed90 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml @@ -169,7 +169,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml index 9fa8e7235c9..e96203a9214 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml @@ -233,7 +233,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: default/tcp-gateway/bar port: 8089 routes: @@ -292,7 +292,7 @@ xdsIR: tcp: connectTimeout: 15s udp: - - address: 0.0.0.0 + - address: '::' name: default/tcp-gateway/foo port: 8162 route: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml index 5b1707b6f1a..89f07548c29 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml @@ -306,7 +306,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: default/tcp-gateway/bar port: 8089 routes: @@ -365,7 +365,7 @@ xdsIR: tcp: connectTimeout: 15s udp: - - address: 0.0.0.0 + - address: '::' name: default/tcp-gateway/foo port: 8162 route: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml index 0213525db48..bf91d10226e 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml @@ -249,7 +249,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -290,7 +290,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml index dc80d9e73a8..ab1c94ff3c9 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml @@ -127,7 +127,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml index ea546413a59..8a25a4a2fc8 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-targetrefs.out.yaml @@ -237,7 +237,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -277,7 +277,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml index 0fad514c5e8..0244bcea667 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml @@ -257,7 +257,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -301,7 +301,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml index a11ad751e08..2f2cc555d95 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-format-error.out.yaml @@ -159,7 +159,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -173,7 +173,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' connection: {} hostnames: - '*' diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml index 9993a11f26d..20191e8b4ba 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit-with-out-of-range-error.out.yaml @@ -160,7 +160,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -174,7 +174,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' connection: {} hostnames: - '*' diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml index d897fac8887..bbccfc1a09e 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-buffer-limit.out.yaml @@ -159,7 +159,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' connection: bufferLimit: 50000000 hostnames: @@ -175,7 +175,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' connection: {} hostnames: - '*' diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml index 898d87d0be0..46d7c08e297 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-client-ip-detection.out.yaml @@ -262,7 +262,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' clientIPDetection: xForwardedFor: numTrustedHops: 2 @@ -279,7 +279,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8081 - - address: 0.0.0.0 + - address: '::' clientIPDetection: customHeader: failClosed: false @@ -297,7 +297,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8082 - - address: 0.0.0.0 + - address: '::' clientIPDetection: customHeader: failClosed: true @@ -315,7 +315,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8083 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml index 705e23a8d0e..d5d78569444 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit-error.out.yaml @@ -161,7 +161,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -175,7 +175,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml index e4f163f5963..6f99ddff5b9 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-connection-limit.out.yaml @@ -161,7 +161,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' connection: limit: closeDelay: 10s @@ -179,7 +179,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' connection: {} hostnames: - '*' diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml index efd290c9b1a..630ad335e68 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-for-tcp-listeners.out.yaml @@ -184,7 +184,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' connection: bufferLimit: 50000000 limit: @@ -246,7 +246,7 @@ xdsIR: signatureAlgorithms: - sig1 - sig2 - - address: 0.0.0.0 + - address: '::' connection: bufferLimit: 50000000 limit: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml index 9eee58d7df7..5a27962f198 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers-error.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: enableEnvoyHeaders: true preserveXRequestID: true diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml index 4e66bd91c64..8cc87a5b639 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-headers.out.yaml @@ -141,7 +141,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: earlyAddRequestHeaders: - append: true @@ -170,7 +170,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' headers: earlyAddRequestHeaders: - append: true diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml index f41c8fd3a2c..02f8f67aab8 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http-health-check.out.yaml @@ -89,7 +89,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' healthCheck: path: /ready hostnames: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml index 8561d93004a..3343e3028ba 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http10.out.yaml @@ -454,7 +454,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: @@ -470,7 +470,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - www.example.com http1: @@ -487,7 +487,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: {} @@ -502,7 +502,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8081 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: @@ -537,7 +537,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: {} diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml index 3de4101c8c6..10aec8cce97 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http2.out.yaml @@ -163,7 +163,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http2: @@ -181,7 +181,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - www.example.com http2: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml index 814335baf87..c7168804321 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-http3.out.yaml @@ -131,7 +131,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http3: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml index 94775b0aeab..8052587d753 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout-with-error.out.yaml @@ -90,7 +90,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml index e728cd78c63..af9a6f0c389 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-idle-timeout.out.yaml @@ -128,7 +128,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -145,7 +145,7 @@ xdsIR: timeout: http: idleTimeout: 10s - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml index 4cac0b62d34..a904d50261f 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-client-verification.out.yaml @@ -232,7 +232,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -258,7 +258,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" requireClientCertificate: true - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -277,7 +277,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml index 6e47f653078..9e55ab4521f 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert-custom-data.out.yaml @@ -544,7 +544,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -574,7 +574,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" requireClientCertificate: true - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -597,7 +597,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -632,7 +632,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -669,7 +669,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -708,7 +708,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml index 8d84753bcea..4fff92409a5 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls-forward-client-cert.out.yaml @@ -531,7 +531,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -561,7 +561,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" requireClientCertificate: true - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -584,7 +584,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -619,7 +619,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -654,7 +654,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: @@ -689,7 +689,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: withUnderscoresAction: RejectRequest xForwardedClientCert: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml index 0ee4643dab6..6325c47a9df 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-mtls.out.yaml @@ -231,7 +231,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -257,7 +257,7 @@ xdsIR: maxVersion: "1.3" minVersion: "1.2" requireClientCertificate: true - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -276,7 +276,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml index 2cf85c63b8b..38eeb8b5a52 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-path-settings.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -140,7 +140,7 @@ xdsIR: escapedSlashesAction: KeepUnchanged mergeSlashes: false port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml index 5f48ea0ed67..80d4350f638 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case-multiple-targets.out.yaml @@ -198,7 +198,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: @@ -220,7 +220,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -234,7 +234,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml index 4f6bfdbdf97..160cc58044c 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-preserve-case.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: @@ -143,7 +143,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml index 0d88cb4d8fd..bfac33d66db 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-proxyprotocol.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' enableProxyProtocol: true hostnames: - '*' @@ -141,7 +141,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml index 51e89d7272b..d3daeca2460 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' headers: disableRateLimitHeaders: true enableEnvoyHeaders: true @@ -144,7 +144,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' headers: disableRateLimitHeaders: true enableEnvoyHeaders: true diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml index f4fcac96827..726b258d2b0 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml @@ -502,7 +502,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -521,7 +521,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -536,7 +536,7 @@ xdsIR: mergeSlashes: true port: 10080 tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-2/tcp port: 10053 envoy-gateway/gateway-3: @@ -544,7 +544,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -563,7 +563,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml index 8b0e90b3848..b09699c1419 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml @@ -161,7 +161,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -179,7 +179,7 @@ xdsIR: idleTime: 1200 interval: 60 probes: 3 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml index 7d12e8b98ac..4554e319052 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout-with-error.out.yaml @@ -90,7 +90,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml index 664f5fe1fc7..97416a04bab 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-timeout.out.yaml @@ -128,7 +128,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -145,7 +145,7 @@ xdsIR: timeout: http: requestReceivedTimeout: 5s - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml index ed684f328b4..e22afd945bd 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tls-settings.out.yaml @@ -147,7 +147,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -180,7 +180,7 @@ xdsIR: - sig2 statefulSessionResumption: true statelessSessionResumption: true - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml index 114af441730..354cec1af2d 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-trailers.out.yaml @@ -125,7 +125,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: @@ -141,7 +141,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' http1: diff --git a/internal/gatewayapi/testdata/conflicting-policies.out.yaml b/internal/gatewayapi/testdata/conflicting-policies.out.yaml index 8acabbca876..6933902b8f9 100644 --- a/internal/gatewayapi/testdata/conflicting-policies.out.yaml +++ b/internal/gatewayapi/testdata/conflicting-policies.out.yaml @@ -265,7 +265,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.192.168.0.15.nip.io' isHTTP2: false @@ -300,7 +300,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - qccbahgo.qccbahgo isHTTP2: false diff --git a/internal/gatewayapi/testdata/custom-filter-order.out.yaml b/internal/gatewayapi/testdata/custom-filter-order.out.yaml index 043eeab1543..5a19de24652 100644 --- a/internal/gatewayapi/testdata/custom-filter-order.out.yaml +++ b/internal/gatewayapi/testdata/custom-filter-order.out.yaml @@ -225,7 +225,7 @@ xdsIR: - after: envoy.filters.http.basic_authn name: envoy.filters.http.cors http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml index b0dc0dd4bb1..2f152a026ac 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -119,7 +119,7 @@ infraIR: xdsIR: envoy-gateway/gateway-1: http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml index df3a01d780f..85f79b1e55c 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-invalid-cross-ns-ref.out.yaml @@ -79,7 +79,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml index 4f055e7bc4d..c0b88b42192 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-override-replace.out.yaml @@ -268,7 +268,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -296,7 +296,7 @@ xdsIR: extProcs: - authority: grpc-backend-2.default:8000 destination: - name: envoyextensionpolicy/default/policy-for-route-1/0 + name: envoyextensionpolicy/default/policy-for-route-1/extproc/0 settings: - protocol: GRPC weight: 1 @@ -325,7 +325,7 @@ xdsIR: extProcs: - authority: grpc-backend.envoy-gateway:9000 destination: - name: envoyextensionpolicy/envoy-gateway/policy-for-gateway-1/0 + name: envoyextensionpolicy/envoy-gateway/policy-for-gateway-1/extproc/0 settings: - protocol: GRPC weight: 1 diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml index f4cc57f95ba..0db35ca4bb0 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml @@ -521,7 +521,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -540,7 +540,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -578,7 +578,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -612,6 +612,6 @@ xdsIR: namespace: envoy-gateway name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/* tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-2/tcp port: 10053 diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml index beac28da518..2d0a54ff2da 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-matching-port.out.yaml @@ -130,7 +130,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml index efd62e1e0ea..53232e5735c 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-port.out.yaml @@ -130,7 +130,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml index ba93c2decdc..7a84bb226c8 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-reference-grant.out.yaml @@ -132,7 +132,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml index 066917dd152..ba22f681a33 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-invalid-no-service.out.yaml @@ -131,7 +131,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml index 6b9ad5ee281..81863d1acdf 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-backendtlspolicy.out.yaml @@ -280,7 +280,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -308,7 +308,7 @@ xdsIR: extProcs: - authority: grpc-backend-2.default:9000 destination: - name: envoyextensionpolicy/default/policy-for-http-route/0 + name: envoyextensionpolicy/default/policy-for-http-route/extproc/0 settings: - addressType: IP endpoints: @@ -349,7 +349,7 @@ xdsIR: extProcs: - authority: grpc-backend.envoy-gateway:8000 destination: - name: envoyextensionpolicy/default/policy-for-gateway/0 + name: envoyextensionpolicy/default/policy-for-gateway/extproc/0 settings: - addressType: IP protocol: GRPC diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml index 021ae6a2cd5..4789f8555e3 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-multiple-backendrefs.out.yaml @@ -280,7 +280,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -308,7 +308,7 @@ xdsIR: extProcs: - authority: grpc-backend.envoy-gateway:8000 destination: - name: envoyextensionpolicy/default/policy-for-http-route/0 + name: envoyextensionpolicy/default/policy-for-http-route/extproc/0 settings: - addressType: IP protocol: GRPC diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml index 4edde355292..93c24363c31 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-extproc-with-traffic-features.out.yaml @@ -309,7 +309,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -337,7 +337,7 @@ xdsIR: extProcs: - authority: grpc-backend.envoy-gateway:8000 destination: - name: envoyextensionpolicy/default/policy-for-http-route/0 + name: envoyextensionpolicy/default/policy-for-http-route/extproc/0 settings: - addressType: IP protocol: GRPC diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml new file mode 100644 index 00000000000..f0dfd27144d --- /dev/null +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-env-vars.out.yaml @@ -0,0 +1,342 @@ +envoyExtensionPolicies: +- apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: EnvoyExtensionPolicy + metadata: + creationTimestamp: null + name: policy-for-http-route + namespace: default + spec: + targetRef: + group: gateway.networking.k8s.io + kind: HTTPRoute + name: httproute-1 + wasm: + - code: + http: + sha256: b6922722ab58109abfaa8d9eb16f339b38b2bb1c17076b083b34438b934e7463 + url: https://www.test.com/wasm-filter-4.wasm + type: HTTP + env: + hostKeys: + - SOME_KEY + - ANOTHER_KEY + failOpen: true + name: wasm-filter-4 + status: + ancestors: + - ancestorRef: + group: gateway.networking.k8s.io + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + conditions: + - lastTransitionTime: null + message: Policy has been accepted. + reason: Accepted + status: "True" + type: Accepted + controllerName: gateway.envoyproxy.io/gatewayclass-controller +- apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: EnvoyExtensionPolicy + metadata: + creationTimestamp: null + name: policy-for-gateway + namespace: envoy-gateway + spec: + targetRef: + group: gateway.networking.k8s.io + kind: Gateway + name: gateway-1 + wasm: + - code: + http: + sha256: 2d89c4c6ab2a1c615c7696ed37ade9e50654ac70384b5d45100eb08e62130ff4 + url: https://www.example.com/wasm-filter-1.wasm + type: HTTP + env: + hostKeys: + - SOME_KEY + - ANOTHER_KEY + name: wasm-filter-1 + - code: + image: + pullSecretRef: + group: null + kind: null + name: my-pull-secret + sha256: 314100af781b98a8ca175d5bf90a8bf76576e20a2f397a88223404edc6ebfd46 + url: oci://www.example.com/wasm-filter-2:v1.0.0 + type: Image + env: + hostKeys: + - SOME_KEY + - ANOTHER_KEY + name: wasm-filter-2 + rootID: my-root-id + - code: + image: + sha256: null + url: www.example.com:8080/wasm-filter-3 + type: Image + status: + ancestors: + - ancestorRef: + group: gateway.networking.k8s.io + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + conditions: + - lastTransitionTime: null + message: Policy has been accepted. + reason: Accepted + status: "True" + type: Accepted + - lastTransitionTime: null + message: 'This policy is being overridden by other envoyExtensionPolicies + for these routes: [default/httproute-1]' + reason: Overridden + status: "True" + type: Overridden + controllerName: gateway.envoyproxy.io/gatewayclass-controller +gateways: +- apiVersion: gateway.networking.k8s.io/v1 + kind: Gateway + metadata: + creationTimestamp: null + name: gateway-1 + namespace: envoy-gateway + spec: + gatewayClassName: envoy-gateway-class + listeners: + - allowedRoutes: + namespaces: + from: All + name: http + port: 80 + protocol: HTTP + status: + listeners: + - attachedRoutes: 2 + conditions: + - lastTransitionTime: null + message: Sending translated listener configuration to the data plane + reason: Programmed + status: "True" + type: Programmed + - lastTransitionTime: null + message: Listener has been successfully translated + reason: Accepted + status: "True" + type: Accepted + - lastTransitionTime: null + message: Listener references have been resolved + reason: ResolvedRefs + status: "True" + type: ResolvedRefs + name: http + supportedKinds: + - group: gateway.networking.k8s.io + kind: HTTPRoute + - group: gateway.networking.k8s.io + kind: GRPCRoute +httpRoutes: +- apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + creationTimestamp: null + name: httproute-1 + namespace: default + spec: + hostnames: + - www.example.com + parentRefs: + - name: gateway-1 + namespace: envoy-gateway + sectionName: http + rules: + - backendRefs: + - name: service-1 + port: 8080 + matches: + - path: + value: /foo + status: + parents: + - conditions: + - lastTransitionTime: null + message: Route is accepted + reason: Accepted + status: "True" + type: Accepted + - lastTransitionTime: null + message: Resolved all the Object references for the Route + reason: ResolvedRefs + status: "True" + type: ResolvedRefs + controllerName: gateway.envoyproxy.io/gatewayclass-controller + parentRef: + name: gateway-1 + namespace: envoy-gateway + sectionName: http +- apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + creationTimestamp: null + name: httproute-2 + namespace: default + spec: + hostnames: + - www.example.com + parentRefs: + - name: gateway-1 + namespace: envoy-gateway + sectionName: http + rules: + - backendRefs: + - name: service-1 + port: 8080 + matches: + - path: + value: /bar + status: + parents: + - conditions: + - lastTransitionTime: null + message: Route is accepted + reason: Accepted + status: "True" + type: Accepted + - lastTransitionTime: null + message: Resolved all the Object references for the Route + reason: ResolvedRefs + status: "True" + type: ResolvedRefs + controllerName: gateway.envoyproxy.io/gatewayclass-controller + parentRef: + name: gateway-1 + namespace: envoy-gateway + sectionName: http +infraIR: + envoy-gateway/gateway-1: + proxy: + listeners: + - address: null + name: envoy-gateway/gateway-1/http + ports: + - containerPort: 10080 + name: http-80 + protocol: HTTP + servicePort: 80 + metadata: + labels: + gateway.envoyproxy.io/owning-gateway-name: gateway-1 + gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway + name: envoy-gateway/gateway-1 +xdsIR: + envoy-gateway/gateway-1: + accessLog: + text: + - path: /dev/stdout + http: + - address: '::' + hostnames: + - '*' + isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http + path: + escapedSlashesAction: UnescapeAndRedirect + mergeSlashes: true + port: 10080 + routes: + - destination: + name: httproute/default/httproute-1/rule/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + protocol: HTTP + weight: 1 + envoyExtensions: + wasms: + - config: null + failOpen: true + hostKeys: + - SOME_KEY + - ANOTHER_KEY + httpWasmCode: + originalDownloadingURL: https://www.test.com/wasm-filter-4.wasm + servingURL: https://envoy-gateway:18002/fe571e7b1ef5dc626ceb2c2c86782a134a92989a2643485238951696ae4334c3.wasm + sha256: b6922722ab58109abfaa8d9eb16f339b38b2bb1c17076b083b34438b934e7463 + name: envoyextensionpolicy/default/policy-for-http-route/wasm/0 + wasmName: wasm-filter-4 + hostname: www.example.com + isHTTP2: false + metadata: + kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0/match/0/www_example_com + pathMatch: + distinct: false + name: "" + prefix: /foo + - destination: + name: httproute/default/httproute-2/rule/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + protocol: HTTP + weight: 1 + envoyExtensions: + wasms: + - config: null + failOpen: false + hostKeys: + - SOME_KEY + - ANOTHER_KEY + httpWasmCode: + originalDownloadingURL: https://www.example.com/wasm-filter-1.wasm + servingURL: https://envoy-gateway:18002/5c90b9a82642ce00a7753923fabead306b9d9a54a7c0bd2463a1af3efcfb110b.wasm + sha256: 2d89c4c6ab2a1c615c7696ed37ade9e50654ac70384b5d45100eb08e62130ff4 + name: envoyextensionpolicy/envoy-gateway/policy-for-gateway/wasm/0 + wasmName: wasm-filter-1 + - config: null + failOpen: false + hostKeys: + - SOME_KEY + - ANOTHER_KEY + httpWasmCode: + originalDownloadingURL: oci://www.example.com/wasm-filter-2:v1.0.0 + servingURL: https://envoy-gateway:18002/7abf116e5cd5a20389604a5ba0f3bd04fdf76f92181fe67506b42c2ee596d3fd.wasm + sha256: 314100af781b98a8ca175d5bf90a8bf76576e20a2f397a88223404edc6ebfd46 + name: envoyextensionpolicy/envoy-gateway/policy-for-gateway/wasm/1 + rootID: my-root-id + wasmName: wasm-filter-2 + - config: null + failOpen: false + httpWasmCode: + originalDownloadingURL: oci://www.example.com:8080/wasm-filter-3:latest + servingURL: https://envoy-gateway:18002/42d30b4a4cc631415e6e48c02d244700da327201eb273f752cacf745715b31d9.wasm + sha256: 2a19e4f337e5223d7287e7fccd933fb01905deaff804292e5257f8c681b82bee + name: envoyextensionpolicy/envoy-gateway/policy-for-gateway/wasm/2 + wasmName: envoyextensionpolicy/envoy-gateway/policy-for-gateway/wasm/2 + hostname: www.example.com + isHTTP2: false + metadata: + kind: HTTPRoute + name: httproute-2 + namespace: default + name: httproute/default/httproute-2/rule/0/match/0/www_example_com + pathMatch: + distinct: false + name: "" + prefix: /bar diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml index 8c65fb9cf65..12fad598a5c 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm-targetrefs.out.yaml @@ -207,7 +207,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml index 368c32a4055..71173c47bd0 100644 --- a/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml +++ b/internal/gatewayapi/testdata/envoyextensionpolicy-with-wasm.out.yaml @@ -241,7 +241,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml index e40792057eb..11011a07694 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml @@ -61,7 +61,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml index 4eff002f05f..f2a88d508ed 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-feature-disabled.out.yaml @@ -87,7 +87,7 @@ xdsIR: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml index e36a5d543ac..694ba5cf0ae 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind-merge-gateways.out.yaml @@ -89,7 +89,7 @@ xdsIR: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml index 14addeb27dc..5e28ec9e9d4 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml @@ -80,7 +80,7 @@ xdsIR: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml index 315fc208bad..a73b592ca7f 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid-merge-gateways.out.yaml @@ -116,7 +116,7 @@ xdsIR: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml index 6ac0112c140..cb05e3a5858 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -108,7 +108,7 @@ xdsIR: type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml index 8695f47ecfa..eae92fd6677 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-als-json.out.yaml @@ -182,7 +182,7 @@ xdsIR: name: envoy-gateway-system/test type: TCP http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml index 6c3db20cff0..fe87871df9b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend-invalid.out.yaml @@ -142,7 +142,7 @@ infraIR: xdsIR: envoy-gateway/gateway-1: http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml index 94763fd2522..a676d131d70 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-backend.out.yaml @@ -153,7 +153,7 @@ xdsIR: [%START_TIME%] "%REQ(:METHOD)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"\n path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml index ce6e60861fc..4c9774307ba 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel-with-invalid.out.yaml @@ -142,7 +142,7 @@ infraIR: xdsIR: envoy-gateway/gateway-1: http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml index 4161575dd8a..6c41786f198 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-cel.out.yaml @@ -177,7 +177,7 @@ xdsIR: [%START_TIME%] "%REQ(:METHOD)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"\n path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml index f1fc863b98e..dfa7cb9e73a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml @@ -126,7 +126,7 @@ xdsIR: envoy-gateway/gateway-1: accessLog: {} http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml index cb2e10fc988..22351893208 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml @@ -134,7 +134,7 @@ xdsIR: protocol: '%PROTOCOL%' path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml index 9c2c0d1cf82..481d5d35e0b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-types.out.yaml @@ -426,7 +426,7 @@ xdsIR: this is a Global log path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml index db14cc4b8e3..4d25ea17358 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml @@ -128,7 +128,7 @@ xdsIR: envoy-gateway/gateway-1: accessLog: {} http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml index 28ef831b03a..72234e5db1e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-traffic.out.yaml @@ -310,7 +310,7 @@ xdsIR: [%START_TIME%] "%REQ(:METHOD)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"\n path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml index 43505266ec0..f9db0b48736 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-without-format.out.yaml @@ -194,7 +194,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml index 9694dd07ad7..8c2bec37bde 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -206,7 +206,7 @@ xdsIR: [%START_TIME%] "%REQ(:METHOD)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"\n path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml index 1b31bae27e7..0e4a18b66dc 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing-for-gateway.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml index 9f058d69051..537a739770c 100644 --- a/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-endpoint-routing.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml index 0368e1a1a22..dcfabe29f4c 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend-invalid.out.yaml @@ -135,7 +135,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml index 4bff8f998d5..91706f9afd4 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-backend.out.yaml @@ -128,7 +128,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml index 7605114bf22..293488ec064 100644 --- a/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-metric-enabled-backend.out.yaml @@ -131,7 +131,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml index fda9d4ccca9..f5c685bab24 100644 --- a/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-priority-backend.out.yaml @@ -283,7 +283,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -311,7 +311,7 @@ xdsIR: extProcs: - authority: grpc-backend.envoy-gateway:8000 destination: - name: envoyextensionpolicy/default/policy-for-http-route/0 + name: envoyextensionpolicy/default/policy-for-http-route/extproc/0 settings: - addressType: IP protocol: GRPC diff --git a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml index 76859d37624..88618649c7e 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing-for-gateway.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml index a679b4aef60..1602dc38c8b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-service-routing.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml index b70ae56fce4..6a7e8ddc43c 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid-ns.out.yaml @@ -228,7 +228,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -282,7 +282,7 @@ xdsIR: privateKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV1Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktRd2dnU2dBZ0VBQW9JQkFRQ1pTT21NUlBXWkFqN08KcVFrTVc2d3Bub3NmVCtRMzhmVWJ1U3crRXlablZ1eUNuYlVGZjhIeTVyYkx1K2dmbWszUW8xbnRBVTMzamprUQpXMGQzRHdCdWhKVUM0bkpVRks3cDk2dm9MQ2FTdmlPM0NQbytjUENPdkZ4K1ZrTzYxVkxXOEI2YW04UG5GWndhCmlGRGk0aUdyWXlIK3lsK2RUTmJoZlhIeEJ4T0E1M0IrcTI2K2ZmMFJXUWJKSWNiT1RzOENTSDZJWk1yeGNIcmsKOE1TdjFhWXlQdXpuT1BBQVFsNlRUdlEvNmhJZnF6bXJvd0RIRjRCMENFNUFvb2xFM0ZLT2kwaC9ieTJUN1dxbgo4NkdhdXA0VEtxVnV1Uk5hUU1CZDQ4azA4V3VTUENYSDBoWTVJbm1kdEMxRURKK3pQRk9NUjQycVA0THg5QWdICjNRZTBTMU5yQWdNQkFBRUNnZjk2Zy9QWXh2YVp5NEJuMU5ySkJkOExaT2djYlpjMmdueDZJa3YvVVhaME5obHgKRVlpS2plRmpWNkhXNW9FWHJaKy9tUGY0ZHVzVmFMNzRVOVZvanVQSmNlQWVScmpMM2VPaGJIdGN4KzBnY0dMZwpYeEY5VFJhcDY1VHVVZDFhaTA0aEd3WWY3NXNiUDdSS2JQaXZ3WmdVQWUwQ3BWdWZjaG5YcXJzWXI4cEpZNTFPCldWa1NxejRSWTlXbTBrNUcxSkZ5SXlFQzl1bURsdWpjSE50UlZtYWZrTmZBdENsaVByRktjL245bkpmTzZSRlAKN2c3Vi9JdnFudUlyN1BFM0duNlBhVCtCZ2c0NDh0ZDVKelBwVEE1WkJjQm8yb3J6L2t4WVBGcHIvZ1BVQnFRZApvNm5XcXc3Nlp4d1BsZHdMaEorWFlOWDdvdWN0VVNDTDl1NzdmeUVDZ1lFQXl2N0RseGYrS1FsZkR3bW8vcjFUCjBMMVpuSDQ3MmhpSWVkU2hleVZCSGJFVlRTbXI0MkJSbGpXNERiUmNRTTRWY3h4RGtHclI3NlJHZTlvZzZtemMKUnY4K1ZsQ1gyK3F5OXA1bTZaWHJiQXczMHpDLzVtUGtSV3ViaFVoaSs5ZUNNWmEvaEFJL1JGdjI2OURyQkQyLwo2a2cwRjhYME8vNndJK1dwYXRLM1cwY0NnWUVBd1U5QTZiSnBmYVhLS1hQR21PRy9uVXhUeXp5cVlqS05aSmQvCjlHaEVudUdqSzVDQUVWUEphOGtadmZRemxXbXdaYWZxMERocUk4dkxhRkNEZjhZOEU5OU1hbjNHV2hVYjNWL0oKcU5RUVMzNTZOQ2ZadzdseG9LS0JJdlQ2Y3dpaFRuc0UvUjRIQ3NhbDJ3d040Wmw5SFdOQmdhbVM3VExrejFMaApmd1JEa0wwQ2dZQlo0OWorNW53QTlncG5JVkw1Z3lORGN5WGtlNjNMVlVQU0YwdHV1YitOQTJhNFpiU2RHb0RtCmNHRlJpRVcxMk14OHpjNUpmRlA4dDVVU3NUUVVPeUtNT2VrRDFlcDVVd1B1MjVRYzZldDNUQzNJVW5VWDg3SVkKMzU3ZHRZRkhubFlqMldwemJYOVFxUnk5cmlUMEd0Z0tTZkR2ZWhRK0lQa2szRVZhYlhjT2J3S0JnR0d4QzcwTwp6UUVTcC9nSzZuS1lvNTE2MVY0QWFwcjFzVDhFMFVWUzdGcmU3UGMzTDRHU05saWlhTC8yaVpzWXJteXhUNW1xCjZQanVKUDJ5c3NJQURKeCtYTC8wa0NrMlFiNitpY3NvWUpQR2R6dWthQWpoenVxL05VUFZTanlZUCt6SmZ0dnMKTU9MaFFUQlNCekhidjc3NlNrQ2MwZ1BObEpTeDdnT2l4QUtCQW9HQUpCR1VuM2U1QWZDb21BMUUxRHhSeUxaagpUMFBrQUNlUGpEK3hrRkpod0RoQ2dzd2htNFVKZzFmQW8xaEJRUkZ0dHBWQy91QkxjazE4TUVBSTF2ZGZTeVB2CmtTZzVrVnFQanUzc2czOVRNZ09WZXdqUDNFM0FNUUd1ZzFQNzFZazJ6WUpQbGg5NWRMVTVISlZubzZvdkIrUG0KTHF5K016eDN3a0YwZDhlUFhRND0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= serverCertificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURKRENDQWd5Z0F3SUJBZ0lVU3JTYktMZjBiTEVHb2dXeC9nQ3cyR0N0dnhFd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0V6RVJNQThHQTFVRUF3d0lWR1Z6ZENCSmJtTXdIaGNOTWpRd01qSTVNRGt6TURFd1doY05NelF3TWpJMgpNRGt6TURFd1dqQVRNUkV3RHdZRFZRUUREQWhVWlhOMElFbHVZekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBSzFKempQSWlXZzNxb0hTckFkZGtlSmphTVA5aXlNVGkvQlBvOWNKUG9SRThaaTcKV2FwVXJYTC85QTlyK2pITXlHSVpOWk5kY1o1Y1kyWHYwTFA4WnhWeTJsazArM3d0WXpIbnBHWUdWdHlxMnRldApEaEZzaVBsODJZUmpDMG16V2E0UU16NFNYekZITmdJRHBSZGhmcm92bXNldVdHUUU4cFY0VWQ5VUsvU0tpbE1PCnF0QjVKaXJMUDJWczVUMW9XaWNXTFF2ZmJHd3Y3c0ZEZHI5YkcwWHRTUXAxN0hTZ281MFNERTUrQmpTbXB0RncKMVZjS0xscWFoTVhCRERpb3Jnd2hJaEdHS3BFU2VNMFA3YkZoVm1rTTNhc2gyeFNUQnVGVUJEbEU0Sk9haHp3cwpEWHJ1cFVoRGRTMWhkYzJmUHJqaEZBbEpmV0VZWjZCbFpqeXNpVlVDQXdFQUFhTndNRzR3SFFZRFZSME9CQllFCkZCUXVmSzFMaWJ1Vm05VHMvVmpCeDhMM3VpTmVNQjhHQTFVZEl3UVlNQmFBRkJRdWZLMUxpYnVWbTlUcy9WakIKeDhMM3VpTmVNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdHd1lEVlIwUkJCUXdFb0lCS29JTktpNWxlR0Z0Y0d4bApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWZQUzQxYWdldldNVjNaWHQwQ09GRzN1WWZQRlhuVnc2ClA0MXA5TzZHa2RZc3VxRnZQZVR5eUgyL2RBSUtLd1N6TS9wdGhnOEtuOExabG1KeUZObkExc3RKeG41WGRiVjEKcFBxajhVdllDQnp5ak1JcW1SeW9peUxpUWxib2hNYTBVZEVCS2NIL1BkTEU5SzhUR0pyWmdvR1hxcTFXbWl0RAozdmNQalNlUEtFaVVKVlM5bENoeVNzMEtZNUIraFVRRDBKajZucEZENFprMHhxZHhoMHJXdWVDcXE3dmpxRVl6CnBqNFB3cnVmbjFQQlRtZnhNdVYvVUpWNWViaWtldVpQMzVrV3pMUjdaV0FMN3d1RGRXcC82bzR5azNRTGFuRFEKQ3dnQ0ZjWCtzcyswVnl1TTNZZXJUT1VVOFFWSkp4NFVaQU5aeDYrNDNwZEpaT2NudFBaNENBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-tls/ port: 10445 routes: diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml index 80c15494330..a0b5b43e2d4 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings-invalid.out.yaml @@ -227,7 +227,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -281,7 +281,7 @@ xdsIR: privateKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV1Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktRd2dnU2dBZ0VBQW9JQkFRQ1pTT21NUlBXWkFqN08KcVFrTVc2d3Bub3NmVCtRMzhmVWJ1U3crRXlablZ1eUNuYlVGZjhIeTVyYkx1K2dmbWszUW8xbnRBVTMzamprUQpXMGQzRHdCdWhKVUM0bkpVRks3cDk2dm9MQ2FTdmlPM0NQbytjUENPdkZ4K1ZrTzYxVkxXOEI2YW04UG5GWndhCmlGRGk0aUdyWXlIK3lsK2RUTmJoZlhIeEJ4T0E1M0IrcTI2K2ZmMFJXUWJKSWNiT1RzOENTSDZJWk1yeGNIcmsKOE1TdjFhWXlQdXpuT1BBQVFsNlRUdlEvNmhJZnF6bXJvd0RIRjRCMENFNUFvb2xFM0ZLT2kwaC9ieTJUN1dxbgo4NkdhdXA0VEtxVnV1Uk5hUU1CZDQ4azA4V3VTUENYSDBoWTVJbm1kdEMxRURKK3pQRk9NUjQycVA0THg5QWdICjNRZTBTMU5yQWdNQkFBRUNnZjk2Zy9QWXh2YVp5NEJuMU5ySkJkOExaT2djYlpjMmdueDZJa3YvVVhaME5obHgKRVlpS2plRmpWNkhXNW9FWHJaKy9tUGY0ZHVzVmFMNzRVOVZvanVQSmNlQWVScmpMM2VPaGJIdGN4KzBnY0dMZwpYeEY5VFJhcDY1VHVVZDFhaTA0aEd3WWY3NXNiUDdSS2JQaXZ3WmdVQWUwQ3BWdWZjaG5YcXJzWXI4cEpZNTFPCldWa1NxejRSWTlXbTBrNUcxSkZ5SXlFQzl1bURsdWpjSE50UlZtYWZrTmZBdENsaVByRktjL245bkpmTzZSRlAKN2c3Vi9JdnFudUlyN1BFM0duNlBhVCtCZ2c0NDh0ZDVKelBwVEE1WkJjQm8yb3J6L2t4WVBGcHIvZ1BVQnFRZApvNm5XcXc3Nlp4d1BsZHdMaEorWFlOWDdvdWN0VVNDTDl1NzdmeUVDZ1lFQXl2N0RseGYrS1FsZkR3bW8vcjFUCjBMMVpuSDQ3MmhpSWVkU2hleVZCSGJFVlRTbXI0MkJSbGpXNERiUmNRTTRWY3h4RGtHclI3NlJHZTlvZzZtemMKUnY4K1ZsQ1gyK3F5OXA1bTZaWHJiQXczMHpDLzVtUGtSV3ViaFVoaSs5ZUNNWmEvaEFJL1JGdjI2OURyQkQyLwo2a2cwRjhYME8vNndJK1dwYXRLM1cwY0NnWUVBd1U5QTZiSnBmYVhLS1hQR21PRy9uVXhUeXp5cVlqS05aSmQvCjlHaEVudUdqSzVDQUVWUEphOGtadmZRemxXbXdaYWZxMERocUk4dkxhRkNEZjhZOEU5OU1hbjNHV2hVYjNWL0oKcU5RUVMzNTZOQ2ZadzdseG9LS0JJdlQ2Y3dpaFRuc0UvUjRIQ3NhbDJ3d040Wmw5SFdOQmdhbVM3VExrejFMaApmd1JEa0wwQ2dZQlo0OWorNW53QTlncG5JVkw1Z3lORGN5WGtlNjNMVlVQU0YwdHV1YitOQTJhNFpiU2RHb0RtCmNHRlJpRVcxMk14OHpjNUpmRlA4dDVVU3NUUVVPeUtNT2VrRDFlcDVVd1B1MjVRYzZldDNUQzNJVW5VWDg3SVkKMzU3ZHRZRkhubFlqMldwemJYOVFxUnk5cmlUMEd0Z0tTZkR2ZWhRK0lQa2szRVZhYlhjT2J3S0JnR0d4QzcwTwp6UUVTcC9nSzZuS1lvNTE2MVY0QWFwcjFzVDhFMFVWUzdGcmU3UGMzTDRHU05saWlhTC8yaVpzWXJteXhUNW1xCjZQanVKUDJ5c3NJQURKeCtYTC8wa0NrMlFiNitpY3NvWUpQR2R6dWthQWpoenVxL05VUFZTanlZUCt6SmZ0dnMKTU9MaFFUQlNCekhidjc3NlNrQ2MwZ1BObEpTeDdnT2l4QUtCQW9HQUpCR1VuM2U1QWZDb21BMUUxRHhSeUxaagpUMFBrQUNlUGpEK3hrRkpod0RoQ2dzd2htNFVKZzFmQW8xaEJRUkZ0dHBWQy91QkxjazE4TUVBSTF2ZGZTeVB2CmtTZzVrVnFQanUzc2czOVRNZ09WZXdqUDNFM0FNUUd1ZzFQNzFZazJ6WUpQbGg5NWRMVTVISlZubzZvdkIrUG0KTHF5K016eDN3a0YwZDhlUFhRND0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= serverCertificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURKRENDQWd5Z0F3SUJBZ0lVU3JTYktMZjBiTEVHb2dXeC9nQ3cyR0N0dnhFd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0V6RVJNQThHQTFVRUF3d0lWR1Z6ZENCSmJtTXdIaGNOTWpRd01qSTVNRGt6TURFd1doY05NelF3TWpJMgpNRGt6TURFd1dqQVRNUkV3RHdZRFZRUUREQWhVWlhOMElFbHVZekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBSzFKempQSWlXZzNxb0hTckFkZGtlSmphTVA5aXlNVGkvQlBvOWNKUG9SRThaaTcKV2FwVXJYTC85QTlyK2pITXlHSVpOWk5kY1o1Y1kyWHYwTFA4WnhWeTJsazArM3d0WXpIbnBHWUdWdHlxMnRldApEaEZzaVBsODJZUmpDMG16V2E0UU16NFNYekZITmdJRHBSZGhmcm92bXNldVdHUUU4cFY0VWQ5VUsvU0tpbE1PCnF0QjVKaXJMUDJWczVUMW9XaWNXTFF2ZmJHd3Y3c0ZEZHI5YkcwWHRTUXAxN0hTZ281MFNERTUrQmpTbXB0RncKMVZjS0xscWFoTVhCRERpb3Jnd2hJaEdHS3BFU2VNMFA3YkZoVm1rTTNhc2gyeFNUQnVGVUJEbEU0Sk9haHp3cwpEWHJ1cFVoRGRTMWhkYzJmUHJqaEZBbEpmV0VZWjZCbFpqeXNpVlVDQXdFQUFhTndNRzR3SFFZRFZSME9CQllFCkZCUXVmSzFMaWJ1Vm05VHMvVmpCeDhMM3VpTmVNQjhHQTFVZEl3UVlNQmFBRkJRdWZLMUxpYnVWbTlUcy9WakIKeDhMM3VpTmVNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdHd1lEVlIwUkJCUXdFb0lCS29JTktpNWxlR0Z0Y0d4bApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWZQUzQxYWdldldNVjNaWHQwQ09GRzN1WWZQRlhuVnc2ClA0MXA5TzZHa2RZc3VxRnZQZVR5eUgyL2RBSUtLd1N6TS9wdGhnOEtuOExabG1KeUZObkExc3RKeG41WGRiVjEKcFBxajhVdllDQnp5ak1JcW1SeW9peUxpUWxib2hNYTBVZEVCS2NIL1BkTEU5SzhUR0pyWmdvR1hxcTFXbWl0RAozdmNQalNlUEtFaVVKVlM5bENoeVNzMEtZNUIraFVRRDBKajZucEZENFprMHhxZHhoMHJXdWVDcXE3dmpxRVl6CnBqNFB3cnVmbjFQQlRtZnhNdVYvVUpWNWViaWtldVpQMzVrV3pMUjdaV0FMN3d1RGRXcC82bzR5azNRTGFuRFEKQ3dnQ0ZjWCtzcyswVnl1TTNZZXJUT1VVOFFWSkp4NFVaQU5aeDYrNDNwZEpaT2NudFBaNENBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-tls/ port: 10445 routes: diff --git a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml index 137941240af..7cdd2805c80 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tls-settings.out.yaml @@ -226,7 +226,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -284,7 +284,7 @@ xdsIR: privateKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV1Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktRd2dnU2dBZ0VBQW9JQkFRQ1pTT21NUlBXWkFqN08KcVFrTVc2d3Bub3NmVCtRMzhmVWJ1U3crRXlablZ1eUNuYlVGZjhIeTVyYkx1K2dmbWszUW8xbnRBVTMzamprUQpXMGQzRHdCdWhKVUM0bkpVRks3cDk2dm9MQ2FTdmlPM0NQbytjUENPdkZ4K1ZrTzYxVkxXOEI2YW04UG5GWndhCmlGRGk0aUdyWXlIK3lsK2RUTmJoZlhIeEJ4T0E1M0IrcTI2K2ZmMFJXUWJKSWNiT1RzOENTSDZJWk1yeGNIcmsKOE1TdjFhWXlQdXpuT1BBQVFsNlRUdlEvNmhJZnF6bXJvd0RIRjRCMENFNUFvb2xFM0ZLT2kwaC9ieTJUN1dxbgo4NkdhdXA0VEtxVnV1Uk5hUU1CZDQ4azA4V3VTUENYSDBoWTVJbm1kdEMxRURKK3pQRk9NUjQycVA0THg5QWdICjNRZTBTMU5yQWdNQkFBRUNnZjk2Zy9QWXh2YVp5NEJuMU5ySkJkOExaT2djYlpjMmdueDZJa3YvVVhaME5obHgKRVlpS2plRmpWNkhXNW9FWHJaKy9tUGY0ZHVzVmFMNzRVOVZvanVQSmNlQWVScmpMM2VPaGJIdGN4KzBnY0dMZwpYeEY5VFJhcDY1VHVVZDFhaTA0aEd3WWY3NXNiUDdSS2JQaXZ3WmdVQWUwQ3BWdWZjaG5YcXJzWXI4cEpZNTFPCldWa1NxejRSWTlXbTBrNUcxSkZ5SXlFQzl1bURsdWpjSE50UlZtYWZrTmZBdENsaVByRktjL245bkpmTzZSRlAKN2c3Vi9JdnFudUlyN1BFM0duNlBhVCtCZ2c0NDh0ZDVKelBwVEE1WkJjQm8yb3J6L2t4WVBGcHIvZ1BVQnFRZApvNm5XcXc3Nlp4d1BsZHdMaEorWFlOWDdvdWN0VVNDTDl1NzdmeUVDZ1lFQXl2N0RseGYrS1FsZkR3bW8vcjFUCjBMMVpuSDQ3MmhpSWVkU2hleVZCSGJFVlRTbXI0MkJSbGpXNERiUmNRTTRWY3h4RGtHclI3NlJHZTlvZzZtemMKUnY4K1ZsQ1gyK3F5OXA1bTZaWHJiQXczMHpDLzVtUGtSV3ViaFVoaSs5ZUNNWmEvaEFJL1JGdjI2OURyQkQyLwo2a2cwRjhYME8vNndJK1dwYXRLM1cwY0NnWUVBd1U5QTZiSnBmYVhLS1hQR21PRy9uVXhUeXp5cVlqS05aSmQvCjlHaEVudUdqSzVDQUVWUEphOGtadmZRemxXbXdaYWZxMERocUk4dkxhRkNEZjhZOEU5OU1hbjNHV2hVYjNWL0oKcU5RUVMzNTZOQ2ZadzdseG9LS0JJdlQ2Y3dpaFRuc0UvUjRIQ3NhbDJ3d040Wmw5SFdOQmdhbVM3VExrejFMaApmd1JEa0wwQ2dZQlo0OWorNW53QTlncG5JVkw1Z3lORGN5WGtlNjNMVlVQU0YwdHV1YitOQTJhNFpiU2RHb0RtCmNHRlJpRVcxMk14OHpjNUpmRlA4dDVVU3NUUVVPeUtNT2VrRDFlcDVVd1B1MjVRYzZldDNUQzNJVW5VWDg3SVkKMzU3ZHRZRkhubFlqMldwemJYOVFxUnk5cmlUMEd0Z0tTZkR2ZWhRK0lQa2szRVZhYlhjT2J3S0JnR0d4QzcwTwp6UUVTcC9nSzZuS1lvNTE2MVY0QWFwcjFzVDhFMFVWUzdGcmU3UGMzTDRHU05saWlhTC8yaVpzWXJteXhUNW1xCjZQanVKUDJ5c3NJQURKeCtYTC8wa0NrMlFiNitpY3NvWUpQR2R6dWthQWpoenVxL05VUFZTanlZUCt6SmZ0dnMKTU9MaFFUQlNCekhidjc3NlNrQ2MwZ1BObEpTeDdnT2l4QUtCQW9HQUpCR1VuM2U1QWZDb21BMUUxRHhSeUxaagpUMFBrQUNlUGpEK3hrRkpod0RoQ2dzd2htNFVKZzFmQW8xaEJRUkZ0dHBWQy91QkxjazE4TUVBSTF2ZGZTeVB2CmtTZzVrVnFQanUzc2czOVRNZ09WZXdqUDNFM0FNUUd1ZzFQNzFZazJ6WUpQbGg5NWRMVTVISlZubzZvdkIrUG0KTHF5K016eDN3a0YwZDhlUFhRND0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= serverCertificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURKRENDQWd5Z0F3SUJBZ0lVU3JTYktMZjBiTEVHb2dXeC9nQ3cyR0N0dnhFd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0V6RVJNQThHQTFVRUF3d0lWR1Z6ZENCSmJtTXdIaGNOTWpRd01qSTVNRGt6TURFd1doY05NelF3TWpJMgpNRGt6TURFd1dqQVRNUkV3RHdZRFZRUUREQWhVWlhOMElFbHVZekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBSzFKempQSWlXZzNxb0hTckFkZGtlSmphTVA5aXlNVGkvQlBvOWNKUG9SRThaaTcKV2FwVXJYTC85QTlyK2pITXlHSVpOWk5kY1o1Y1kyWHYwTFA4WnhWeTJsazArM3d0WXpIbnBHWUdWdHlxMnRldApEaEZzaVBsODJZUmpDMG16V2E0UU16NFNYekZITmdJRHBSZGhmcm92bXNldVdHUUU4cFY0VWQ5VUsvU0tpbE1PCnF0QjVKaXJMUDJWczVUMW9XaWNXTFF2ZmJHd3Y3c0ZEZHI5YkcwWHRTUXAxN0hTZ281MFNERTUrQmpTbXB0RncKMVZjS0xscWFoTVhCRERpb3Jnd2hJaEdHS3BFU2VNMFA3YkZoVm1rTTNhc2gyeFNUQnVGVUJEbEU0Sk9haHp3cwpEWHJ1cFVoRGRTMWhkYzJmUHJqaEZBbEpmV0VZWjZCbFpqeXNpVlVDQXdFQUFhTndNRzR3SFFZRFZSME9CQllFCkZCUXVmSzFMaWJ1Vm05VHMvVmpCeDhMM3VpTmVNQjhHQTFVZEl3UVlNQmFBRkJRdWZLMUxpYnVWbTlUcy9WakIKeDhMM3VpTmVNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdHd1lEVlIwUkJCUXdFb0lCS29JTktpNWxlR0Z0Y0d4bApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWZQUzQxYWdldldNVjNaWHQwQ09GRzN1WWZQRlhuVnc2ClA0MXA5TzZHa2RZc3VxRnZQZVR5eUgyL2RBSUtLd1N6TS9wdGhnOEtuOExabG1KeUZObkExc3RKeG41WGRiVjEKcFBxajhVdllDQnp5ak1JcW1SeW9peUxpUWxib2hNYTBVZEVCS2NIL1BkTEU5SzhUR0pyWmdvR1hxcTFXbWl0RAozdmNQalNlUEtFaVVKVlM5bENoeVNzMEtZNUIraFVRRDBKajZucEZENFprMHhxZHhoMHJXdWVDcXE3dmpxRVl6CnBqNFB3cnVmbjFQQlRtZnhNdVYvVUpWNWViaWtldVpQMzVrV3pMUjdaV0FMN3d1RGRXcC82bzR5azNRTGFuRFEKQ3dnQ0ZjWCtzcyswVnl1TTNZZXJUT1VVOFFWSkp4NFVaQU5aeDYrNDNwZEpaT2NudFBaNENBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-tls/ port: 10445 routes: diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml index 3506b9a0aba..1a43989014b 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend-invalid.out.yaml @@ -135,7 +135,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml index b3a44d78fdc..cb5292b6d20 100644 --- a/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-tracing-backend.out.yaml @@ -155,7 +155,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index 5bd374167ee..6df12542bcc 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -119,7 +119,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml index 0095b815fd7..731eebc1c72 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-tcp-listener.out.yaml @@ -146,7 +146,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 @@ -204,7 +204,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 port: 10080 - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml index 1ff835552d9..71e6d1cdfe6 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-udp-listener.out.yaml @@ -146,7 +146,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 @@ -204,7 +204,7 @@ xdsIR: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/udp1 port: 10162 - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml index 8140d239ab5..066cd664242 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-invalid-target.out.yaml @@ -97,7 +97,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -111,7 +111,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10081 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml index 5a0b8ef2f97..0ba6cb4868c 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target-array.out.yaml @@ -157,7 +157,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 @@ -218,7 +218,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 diff --git a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml index 29b482ae554..daa4b7e0095 100644 --- a/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml +++ b/internal/gatewayapi/testdata/extensions/extensionpolicy-with-valid-target.out.yaml @@ -150,7 +150,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 @@ -191,7 +191,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10081 - - address: 0.0.0.0 + - address: '::' extensionRefs: - object: apiVersion: foo.example.io/v1alpha1 diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml index 79aeb1f3eeb..069d311948f 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml @@ -109,7 +109,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml index d70cea292b5..f2fcc7a5859 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml index 1af974c72bb..13e693b41de 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml index 1cb405e4dd8..73664fdf291 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml index 2dd68040951..56b396fa4b6 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml @@ -96,7 +96,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml index 35383fcb502..6dda7c9d89c 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml @@ -96,7 +96,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml b/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml index cb47542a1c7..e384db96691 100644 --- a/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml +++ b/internal/gatewayapi/testdata/gateway-http-listener-with-hostname-intersection.out.yaml @@ -172,7 +172,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -204,7 +204,7 @@ xdsIR: distinct: false name: "" prefix: /empty-hostname - - address: 0.0.0.0 + - address: '::' hostnames: - '*.example.com' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml index 7616aff3b9e..7b402b30fbd 100644 --- a/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml +++ b/internal/gatewayapi/testdata/gateway-infrastructure.out.yaml @@ -114,7 +114,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml index 798641857cd..2eb3f6ba8ea 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -66,6 +66,6 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml index 8794f263e57..a4c79fa1d29 100644 --- a/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-infrastructure-parametersref.out.yaml @@ -123,7 +123,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml index deed8d261b5..c458d7e982f 100644 --- a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-does-not-exist.out.yaml @@ -106,7 +106,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml index 0ec88f622c9..e9402d144eb 100644 --- a/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-invalid-infrastructure-parametersref-fallback.out.yaml @@ -123,7 +123,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml index 866ca1e861a..d6fcc45aa78 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml @@ -91,7 +91,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml index cbc01a3d11d..042f236965e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10080 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml index 7e583a73bda..15fcf27bc68 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml @@ -96,6 +96,6 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml index 649a4555722..b3ac75fa761 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml @@ -103,7 +103,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml index 9d4d0a7528e..c5583435fcb 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml @@ -172,7 +172,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.bar.com isHTTP2: false @@ -214,7 +214,7 @@ xdsIR: privateKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K serverCertificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls-passthrough port: 10090 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml index 03cf19502d7..88a7435683f 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml @@ -91,7 +91,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp port: 10162 route: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml index 70a5a2a8599..bf252dfb7e0 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp port: 10080 route: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml index 850f9e64cba..c87bc540bd1 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml @@ -96,6 +96,6 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml index 79295aded7b..a44c4ff584c 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml @@ -59,6 +59,6 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml index a30d7cf5a5b..00233142fc1 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml @@ -59,6 +59,6 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp port: 10080 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml index cb443c09c8b..76680aa7090 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml @@ -105,7 +105,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml index 754923d89fe..0301ff4616d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml @@ -105,7 +105,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml index 5b692e70ab2..613e1040a15 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml @@ -102,7 +102,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml index 6598bfde8d4..2575bc79de1 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -96,7 +96,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml index f7fd4e2752c..7513e60bfb8 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml @@ -122,7 +122,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml index 4f4555a87e8..c94a3f623a4 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml @@ -122,7 +122,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp port: 10162 route: diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml index 10f483e7293..021cede63bd 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -102,7 +102,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml index e3bc11e2cc5..3bec02c1f8f 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml @@ -115,7 +115,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp1 port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml index 5f904c3de3e..0a76a7d86a6 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml @@ -118,7 +118,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp1 port: 10162 route: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml index d6b31a59f6a..248169c209b 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml @@ -168,7 +168,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.com isHTTP2: false @@ -223,7 +223,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml index 67867078333..0238ba3007e 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml @@ -163,7 +163,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -199,7 +199,7 @@ xdsIR: name: "" prefix: / tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10080 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml index b7bdac0b389..6d8bd1f0905 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml @@ -163,7 +163,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -199,7 +199,7 @@ xdsIR: name: "" prefix: / udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp port: 10080 route: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml index d2d74cd296e..07e3e01a70c 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml @@ -160,7 +160,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp1 port: 10162 routes: @@ -174,7 +174,7 @@ xdsIR: protocol: TCP weight: 1 name: tcproute/default/tcproute-1 - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp2 port: 10163 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml index 20519f07857..b5a71ddbe5e 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml @@ -156,7 +156,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp1 port: 10161 routes: @@ -170,7 +170,7 @@ xdsIR: protocol: TCP weight: 1 name: tcproute/default/tcproute-1 - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp2 port: 10162 routes: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml index 00a61415035..deac14645ab 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml @@ -160,7 +160,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp1 port: 10162 route: @@ -174,7 +174,7 @@ xdsIR: protocol: UDP weight: 1 name: udproute/default/udproute-1 - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp2 port: 10163 route: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml index f6cb6959c4b..96ca8ca522c 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml @@ -156,7 +156,7 @@ xdsIR: text: - path: /dev/stdout udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp1 port: 10161 route: @@ -170,7 +170,7 @@ xdsIR: protocol: UDP weight: 1 name: udproute/default/udproute-1 - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/udp2 port: 10162 route: diff --git a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml index ba9f13c3136..bec911cea72 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-backend.out.yaml @@ -123,7 +123,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml index 2f633cb8a20..8c2660b6324 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-empty-backends.out.yaml @@ -96,7 +96,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index bc7697e2f18..a41913ed8fb 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml index 765481a5838..fafd1fdbf56 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index 38b49dda801..a30cb02b50e 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -102,7 +102,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml index 110d404c44f..43ada6439a9 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -106,7 +106,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index b8855487138..639603a07e6 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -102,7 +102,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml index bda6f990dda..22a6796814c 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout-error.out.yaml @@ -134,7 +134,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml index 04843eba9aa..004456773c4 100644 --- a/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-and-backendtrafficpolicy-with-timeout.out.yaml @@ -254,7 +254,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -297,7 +297,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml index e532697a7b4..cad7873ad13 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml @@ -356,7 +356,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.com isHTTP2: false @@ -391,7 +391,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar.com isHTTP2: false @@ -426,7 +426,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - foo1.com isHTTP2: false @@ -461,7 +461,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar1.com isHTTP2: false @@ -496,7 +496,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - foo2.com isHTTP2: false @@ -531,7 +531,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar2.com isHTTP2: false @@ -566,7 +566,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - foo3.com isHTTP2: false @@ -601,7 +601,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar3.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml index 5bc5e17485a..ff94451e5bc 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml @@ -307,7 +307,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.com isHTTP2: false @@ -342,7 +342,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar.com isHTTP2: false @@ -377,7 +377,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - foo1.com isHTTP2: false @@ -412,7 +412,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar1.com isHTTP2: false @@ -447,7 +447,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - foo2.com isHTTP2: false @@ -482,7 +482,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar2.com isHTTP2: false @@ -517,7 +517,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - foo3.com isHTTP2: false @@ -552,7 +552,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar3.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml index bec756628f7..3ffabbbc4ed 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml @@ -138,7 +138,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -173,7 +173,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml index 4d3310f2614..07bb66f43b7 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml @@ -127,7 +127,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.com isHTTP2: false @@ -162,7 +162,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index 817bc24013a..ee8dccb4256 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -96,7 +96,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml index 4abbc554d9d..5ce4b0143c2 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml index 5b4bf8d4bb9..8897f06d841 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml @@ -129,7 +129,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.com isHTTP2: false @@ -143,7 +143,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - bar.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml index 484fe119154..f4a6b3f6334 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-and-core-backendrefs.out.yaml @@ -202,7 +202,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml index 80b6f6627b2..f5bf64e50d7 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref-mixed-address-type.out.yaml @@ -259,7 +259,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml index cdbbe788086..f4b38eead2f 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-backend-backendref.out.yaml @@ -342,7 +342,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml index 3b5ddfa6298..e758629820c 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-diff-address-type.out.yaml @@ -281,7 +281,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml index 5a413ae4630..8f302d19c11 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-backend-backendrefs-same-address-type.out.yaml @@ -290,7 +290,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml index 7b2b55fe1c0..a673d3342dd 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-diff-address-type.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml index 5667491636e..8c02b288f1d 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-multiple-serviceimport-backendrefs-same-address-type.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml index e29f978c85e..73f0582b114 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-fqdn-address-type.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml index 38c70c4a8d2..6de22de9901 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref-mixed-address-type.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml index 144ccbd3c57..7efbce03645 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 3bdc7cc4697..865bc78af93 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -98,7 +98,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml index c49d551e867..99d9d4f7725 100644 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml index 9cd60408345..3138c613b78 100644 --- a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml @@ -99,7 +99,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - foo.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml index dc1c9cb950d..242028fb5bc 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml index c7fd7b9e40e..ddc5eec76b5 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-empty-backends-and-no-filters.out.yaml @@ -93,7 +93,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml index 11634b9f050..dbd5d70f62f 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml index e9a785e0d1b..2f4fc1349a0 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml @@ -106,7 +106,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml index 4c5fcd5e8e2..5e89675b3e5 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-app-protocols.out.yaml @@ -175,7 +175,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml index d56407b0dd9..3e9f0b780d4 100644 --- a/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml +++ b/internal/gatewayapi/testdata/httproute-rule-with-non-service-backends-and-weights.out.yaml @@ -173,7 +173,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml index 122d09efdeb..3828541e423 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-add-multiple-filters.out.yaml @@ -121,7 +121,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index d708b748380..290787479f9 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -98,7 +98,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml index 9b175f032c4..58c0c38d89d 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml index 29b6b051366..8be2bc8a4e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-direct-response.out.yaml @@ -153,7 +153,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 6853b8172b3..6b21dddcd4e 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml index 605aa384f3e..3ab8edd3fb0 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml @@ -116,7 +116,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml index f122fc17d5b..0f06a777a42 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml index e3ea3d5158b..92a45ab8ea5 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml index 23567e22077..5b8b7e76f2f 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml index 67c14e133a7..af3f6e189d5 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml @@ -110,7 +110,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml index 7549c52cbb1..f49fa9e41e9 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml index 5405ad66246..2b0623b7710 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml @@ -113,7 +113,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml index a8986f5d429..faaa608b996 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml index 36f621f095c..9a73541ccec 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml index b111af6e08b..f345d70ae45 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml index 2ca033356bb..6c390846d3a 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml @@ -97,7 +97,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml index e7c2869de1c..26bffbc4231 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml @@ -101,7 +101,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml index a1c5683d27a..818ac56cde8 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml @@ -99,7 +99,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml index ed62f94f257..fb9ee9fbe2d 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml @@ -97,7 +97,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml index 794a5d87c3a..b26a993bf21 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml @@ -99,7 +99,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml index 18019d56e70..f0af70dfcd6 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml @@ -97,7 +97,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml index f9ee3bb21fa..10fbc26ad4f 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-unsupported-filter.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml index 3500d3be9cc..e52f15b3ac1 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml @@ -98,7 +98,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml index 05617ca8192..07e602727f7 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-regex.out.yaml @@ -148,7 +148,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -167,7 +167,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml index 8d86bec237a..65528b6af22 100644 --- a/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-metadata.out.yaml @@ -98,7 +98,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml index 29d9dd320a5..7b213e66450 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -114,7 +114,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml index c6e534c9c63..7251228643b 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml index 50105a1e054..ad035eb7c47 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml index c0c193e034a..44ab3461292 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index e9f94617b4e..e1f711349e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml b/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml index c7801a560d0..d0f71d4d6a1 100644 --- a/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multi-gateways-notmatch.out.yaml @@ -116,7 +116,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -135,7 +135,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml b/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml index f3c1a6b1ed4..84dae610113 100644 --- a/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multi-gateways-with-same-name.out.yaml @@ -149,7 +149,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -189,7 +189,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml index ba2f58b8667..61b67c75d89 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-different-ns.out.yaml @@ -178,7 +178,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.a.example.com' isHTTP2: false @@ -215,7 +215,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.b.example.com' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml index 4e6bef64b9e..03f487b3aa4 100644 --- a/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-multiple-gateways-from-same-ns.out.yaml @@ -176,7 +176,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.a.example.com' isHTTP2: false @@ -213,7 +213,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.b.example.com' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 810a78ccb87..878e6bd1574 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml index d40408b2b02..9cdddc09c08 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml @@ -106,7 +106,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml index d7496698338..9d122032e5e 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml index 63b32e64bb8..06dc740e0f6 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml index 43ca155587d..440d12ac4a3 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml index 588877b155e..104daac410d 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml @@ -103,7 +103,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml index 9676b5d7688..265050323ef 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml index 6dcb4b28779..636bcf1289e 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml @@ -122,7 +122,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml index 47d61c9fcfa..f89d8bdc91a 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml @@ -116,7 +116,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml index 1d2f4f7124c..5e03bbf8f52 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml @@ -126,7 +126,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml index b0dbd71c18d..a5915c1f9d1 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml index 893ce8cc969..7b6b7508258 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml index 723cabbe6f7..0a032d52b85 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml @@ -110,7 +110,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml index 6c8c063716d..17b26b97dc9 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml index f46e5ae3977..b3c0c252310 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml @@ -113,7 +113,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml index e8d2f720d19..f50cbfec103 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml @@ -104,7 +104,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml index cd89f06e995..6a8bec12323 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml index e0f78c08c9d..aff1b276aa8 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml index a73f169aad1..0e7d3803555 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml @@ -97,7 +97,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml index d4bf9af1612..c1005576fe9 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml index 48706fbfb0c..ab30a3cb5db 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml @@ -123,7 +123,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml index 0be3cbea1d2..75b4de50088 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml @@ -101,7 +101,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml index ff9f5d272a8..97753e5fcee 100644 --- a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml @@ -101,7 +101,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 34ec33802bf..291ce9105ae 100644 --- a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -99,7 +99,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml index 2213aa315cb..4e4afb6be35 100644 --- a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -100,7 +100,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml index 3d8c69a6178..5b9bb7fd74d 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml index 8e3079c9bbe..4aed1840d42 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml index c0d8cce8b8a..7dc2cb30469 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -105,7 +105,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml index 7cbff74f25b..0c8665dc24d 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml @@ -105,7 +105,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml index e1905ea7933..f30c9859523 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml @@ -111,7 +111,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml index 3dcffc8edbb..46d54b18956 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml @@ -113,7 +113,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml index c51f0b56107..fcb1f1ea710 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml @@ -109,7 +109,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml index 25991b658fa..20023c84cf8 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml @@ -108,7 +108,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml index 86b8fce36bd..9e55e63c72a 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml @@ -106,7 +106,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml index dd20383d2ea..d6c093778ea 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml @@ -107,7 +107,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml index c42f3934568..bb60b64605c 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-http.out.yaml @@ -245,7 +245,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml index 17ffc680f52..24f1e8043f8 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-regex-match-replace-invalid.out.yaml @@ -342,7 +342,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml index ab24ec0e81d..93a4d218056 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter-invalid.out.yaml @@ -348,7 +348,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml index 916f7d0cefe..2979fabc641 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-hostname-filter.out.yaml @@ -249,7 +249,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml index 821a30d4cb3..636d864e709 100644 --- a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml @@ -98,7 +98,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index a21561696f2..ec627ecda95 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -283,7 +283,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml index d8d24642dd3..33ab0632ce2 100644 --- a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml @@ -136,7 +136,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -151,6 +151,6 @@ xdsIR: mergeSlashes: true port: 10080 udp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-2/udp port: 10080 diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml index 0e015155214..27f75da25ec 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-listeners-same-ports.out.yaml @@ -172,7 +172,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -186,7 +186,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - company.com isHTTP2: false @@ -200,7 +200,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8888 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -214,7 +214,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8888 - - address: 0.0.0.0 + - address: '::' hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml index 4c48dd68694..dba5580e6a7 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml @@ -223,7 +223,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -258,7 +258,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -272,7 +272,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8888 - - address: 0.0.0.0 + - address: '::' hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml index 7afe665224b..b5fb3b7915b 100644 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml @@ -145,7 +145,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -159,7 +159,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -173,7 +173,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8888 - - address: 0.0.0.0 + - address: '::' hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml index b0e8b627fe8..1c828fc13bf 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies-2.out.yaml @@ -501,7 +501,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - bar.example.com isHTTP2: false @@ -560,7 +560,7 @@ xdsIR: timeout: http: requestReceivedTimeout: 5s - - address: 0.0.0.0 + - address: '::' hostnames: - foo.example.com isHTTP2: false @@ -619,7 +619,7 @@ xdsIR: timeout: http: requestReceivedTimeout: 5s - - address: 0.0.0.0 + - address: '::' hostnames: - bar.example.com isHTTP2: false @@ -670,7 +670,7 @@ xdsIR: - x-header-7 - x-header-8 maxAge: 33m20s - - address: 0.0.0.0 + - address: '::' hostnames: - foo.example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml index 8e62bb597d5..92ca64456d4 100644 --- a/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml +++ b/internal/gatewayapi/testdata/merge-with-isolated-policies.out.yaml @@ -293,7 +293,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -349,7 +349,7 @@ xdsIR: idleTime: 1200 interval: 60 probes: 3 - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml index 5ce63e62453..d1f9b18c250 100644 --- a/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-invalid-cross-ns-ref.out.yaml @@ -90,7 +90,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml index c6f72065531..7b56ed6a0f9 100644 --- a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml @@ -300,7 +300,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml index 607330a824c..e4898317537 100644 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml @@ -406,7 +406,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -444,7 +444,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -478,6 +478,6 @@ xdsIR: name: grpcroute/envoy-gateway/grpcroute-1/rule/0/match/0/* security: {} tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-2/tcp port: 10053 diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml index 82281af294a..01a3b8426dc 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-client-cidr.out.yaml @@ -285,7 +285,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml index ed422e70031..95885020f69 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml @@ -154,7 +154,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml index b690cb20370..1a8629c4e44 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-basic-auth.out.yaml @@ -212,7 +212,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml index 789da05196b..2842832ec14 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors-targetrefs.out.yaml @@ -339,7 +339,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -394,7 +394,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -431,7 +431,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml index 3f58304e886..ad7f13fd7bb 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml @@ -402,7 +402,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -460,7 +460,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -519,7 +519,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.in.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.in.yaml index 78529bf6d73..5d756b3b981 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.in.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.in.yaml @@ -58,6 +58,44 @@ httpRoutes: backendRefs: - name: service-3 port: 8080 + - apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + namespace: default + name: httproute-3 + spec: + hostnames: + - www.baz.com + parentRefs: + - namespace: default + name: gateway-1 + sectionName: http + rules: + - matches: + - path: + value: /baz + backendRefs: + - name: service-4 + port: 8080 + - apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + namespace: default + name: httproute-4 + spec: + hostnames: + - www.qux.com + parentRefs: + - namespace: default + name: gateway-1 + sectionName: http + rules: + - matches: + - path: + value: /qux + backendRefs: + - name: service-5 + port: 8080 backends: - apiVersion: gateway.envoyproxy.io/v1alpha1 kind: Backend @@ -108,3 +146,40 @@ securityPolicies: kind: Backend group: gateway.envoyproxy.io port: 3000 + - apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: SecurityPolicy + metadata: + namespace: default + name: policy-for-http-route-3--grpc-backendref + spec: + targetRef: + group: gateway.networking.k8s.io + kind: HTTPRoute + name: httproute-3 + extAuth: + failOpen: true + headersToExtAuth: + - header3 + - header4 + grpc: + backendRef: + name: service-2 + kind: Service + port: 8080 + - apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: SecurityPolicy + metadata: + namespace: default + name: policy-for-http-route-3-http-backendref + spec: + targetRef: + group: gateway.networking.k8s.io + kind: HTTPRoute + name: httproute-4 + extAuth: + http: + backendRef: + name: backend-fqdn + kind: Backend + group: gateway.envoyproxy.io + port: 3000 diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml index 05086bae4c8..a2128bd6085 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backend.out.yaml @@ -35,7 +35,7 @@ gateways: protocol: HTTP status: listeners: - - attachedRoutes: 2 + - attachedRoutes: 4 conditions: - lastTransitionTime: null message: Sending translated listener configuration to the data plane @@ -141,6 +141,82 @@ httpRoutes: name: gateway-1 namespace: default sectionName: http +- apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + creationTimestamp: null + name: httproute-3 + namespace: default + spec: + hostnames: + - www.baz.com + parentRefs: + - name: gateway-1 + namespace: default + sectionName: http + rules: + - backendRefs: + - name: service-4 + port: 8080 + matches: + - path: + value: /baz + status: + parents: + - conditions: + - lastTransitionTime: null + message: Route is accepted + reason: Accepted + status: "True" + type: Accepted + - lastTransitionTime: null + message: Resolved all the Object references for the Route + reason: ResolvedRefs + status: "True" + type: ResolvedRefs + controllerName: gateway.envoyproxy.io/gatewayclass-controller + parentRef: + name: gateway-1 + namespace: default + sectionName: http +- apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + creationTimestamp: null + name: httproute-4 + namespace: default + spec: + hostnames: + - www.qux.com + parentRefs: + - name: gateway-1 + namespace: default + sectionName: http + rules: + - backendRefs: + - name: service-5 + port: 8080 + matches: + - path: + value: /qux + status: + parents: + - conditions: + - lastTransitionTime: null + message: Route is accepted + reason: Accepted + status: "True" + type: Accepted + - lastTransitionTime: null + message: Service default/service-5 not found + reason: BackendNotFound + status: "False" + type: ResolvedRefs + controllerName: gateway.envoyproxy.io/gatewayclass-controller + parentRef: + name: gateway-1 + namespace: default + sectionName: http infraIR: default/gateway-1: proxy: @@ -198,13 +274,82 @@ securityPolicies: status: "True" type: Accepted controllerName: gateway.envoyproxy.io/gatewayclass-controller +- apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: SecurityPolicy + metadata: + creationTimestamp: null + name: policy-for-http-route-3--grpc-backendref + namespace: default + spec: + extAuth: + failOpen: true + grpc: + backendRef: + kind: Service + name: service-2 + port: 8080 + headersToExtAuth: + - header3 + - header4 + targetRef: + group: gateway.networking.k8s.io + kind: HTTPRoute + name: httproute-3 + status: + ancestors: + - ancestorRef: + group: gateway.networking.k8s.io + kind: Gateway + name: gateway-1 + namespace: default + sectionName: http + conditions: + - lastTransitionTime: null + message: Policy has been accepted. + reason: Accepted + status: "True" + type: Accepted + controllerName: gateway.envoyproxy.io/gatewayclass-controller +- apiVersion: gateway.envoyproxy.io/v1alpha1 + kind: SecurityPolicy + metadata: + creationTimestamp: null + name: policy-for-http-route-3-http-backendref + namespace: default + spec: + extAuth: + http: + backendRef: + group: gateway.envoyproxy.io + kind: Backend + name: backend-fqdn + port: 3000 + targetRef: + group: gateway.networking.k8s.io + kind: HTTPRoute + name: httproute-4 + status: + ancestors: + - ancestorRef: + group: gateway.networking.k8s.io + kind: Gateway + name: gateway-1 + namespace: default + sectionName: http + conditions: + - lastTransitionTime: null + message: Policy has been accepted. + reason: Accepted + status: "True" + type: Accepted + controllerName: gateway.envoyproxy.io/gatewayclass-controller xdsIR: default/gateway-1: accessLog: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -245,7 +390,7 @@ xdsIR: grpc: authority: service-2.default:8080 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -289,7 +434,7 @@ xdsIR: grpc: authority: service-2.default:8080 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -327,3 +472,73 @@ xdsIR: distinct: false name: "" prefix: /bar + - destination: + name: httproute/default/httproute-3/rule/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + protocol: HTTP + weight: 1 + hostname: www.baz.com + isHTTP2: false + metadata: + kind: HTTPRoute + name: httproute-3 + namespace: default + name: httproute/default/httproute-3/rule/0/match/0/www_baz_com + pathMatch: + distinct: false + name: "" + prefix: /baz + security: + extAuth: + failOpen: true + grpc: + authority: service-2.default:8080 + destination: + name: securitypolicy/default/policy-for-http-route-3--grpc-backendref/extauth/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + protocol: GRPC + weight: 1 + headersToExtAuth: + - header3 + - header4 + name: securitypolicy/default/policy-for-http-route-3--grpc-backendref + - destination: + name: httproute/default/httproute-4/rule/0 + settings: + - weight: 1 + directResponse: + statusCode: 500 + hostname: www.qux.com + isHTTP2: false + metadata: + kind: HTTPRoute + name: httproute-4 + namespace: default + name: httproute/default/httproute-4/rule/0/match/0/www_qux_com + pathMatch: + distinct: false + name: "" + prefix: /qux + security: + extAuth: + http: + authority: primary.foo.com:3000 + destination: + name: securitypolicy/default/policy-for-http-route-3-http-backendref/extauth/0 + settings: + - addressType: FQDN + endpoints: + - host: primary.foo.com + port: 3000 + protocol: HTTP + weight: 1 + path: "" + name: securitypolicy/default/policy-for-http-route-3-http-backendref diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml index 905b81b3cba..ded079e5c9c 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-backendref.out.yaml @@ -222,7 +222,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -263,7 +263,7 @@ xdsIR: grpc: authority: grpc-backend.default:9000 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -301,7 +301,7 @@ xdsIR: grpc: authority: grpc-backend.default:9000 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -339,7 +339,7 @@ xdsIR: http: authority: http-backend.envoy-gateway:80 destination: - name: securitypolicy/default/policy-for-gateway-1/0 + name: securitypolicy/default/policy-for-gateway-1/extauth/0 settings: - addressType: IP endpoints: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml index c5bf4237f52..d27a3cb2db2 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-matching-port.out.yaml @@ -136,7 +136,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml index 3f5e60f11e8..2bab8201c1d 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-port.out.yaml @@ -136,7 +136,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml index 1f8fd280ad6..c85015431dc 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-reference-grant.out.yaml @@ -137,7 +137,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml index 294267b90e0..fecdfd343c3 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-invalid-no-service.out.yaml @@ -136,7 +136,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml index 94012ec739a..8485328ac78 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-recomputation.out.yaml @@ -205,7 +205,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -246,7 +246,7 @@ xdsIR: grpc: authority: service-2.default:8080 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -291,7 +291,7 @@ xdsIR: grpc: authority: service-2.default:8080 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml index 7c4b2ce2739..4eca64d1a07 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth-with-backendtlspolicy.out.yaml @@ -281,7 +281,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -322,7 +322,7 @@ xdsIR: grpc: authority: grpc-backend.default:9000 destination: - name: securitypolicy/default/policy-for-http-route/0 + name: securitypolicy/default/policy-for-http-route/extauth/0 settings: - addressType: IP endpoints: @@ -366,7 +366,7 @@ xdsIR: http: authority: http-backend.envoy-gateway:80 destination: - name: securitypolicy/default/policy-for-gateway/0 + name: securitypolicy/default/policy-for-gateway/extauth/0 settings: - addressType: IP endpoints: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml index 905b81b3cba..ded079e5c9c 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-extauth.out.yaml @@ -222,7 +222,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -263,7 +263,7 @@ xdsIR: grpc: authority: grpc-backend.default:9000 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -301,7 +301,7 @@ xdsIR: grpc: authority: grpc-backend.default:9000 destination: - name: securitypolicy/default/policy-for-http-route-1/0 + name: securitypolicy/default/policy-for-http-route-1/extauth/0 settings: - addressType: IP endpoints: @@ -339,7 +339,7 @@ xdsIR: http: authority: http-backend.envoy-gateway:80 destination: - name: securitypolicy/default/policy-for-gateway-1/0 + name: securitypolicy/default/policy-for-gateway-1/extauth/0 settings: - addressType: IP endpoints: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml index d5731870d17..37aa96f24a1 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml @@ -234,7 +234,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml index 711d30f0d14..fcbe359dce5 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml @@ -281,7 +281,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -338,7 +338,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml index c892bef7e4f..180b40be7f3 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml @@ -280,7 +280,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -337,7 +337,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml index 704961a0476..54a652f4e27 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml @@ -272,7 +272,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: true @@ -329,7 +329,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml index d6f0c4dbc47..abc63abdc09 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-backendcluster.out.yaml @@ -179,7 +179,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -228,7 +228,7 @@ xdsIR: provider: authorizationEndpoint: https://oauth.foo.com/oauth2/v2/auth destination: - name: securitypolicy/envoy-gateway/policy-for-gateway/0 + name: securitypolicy/envoy-gateway/policy-for-gateway/oidc/0 settings: - addressType: FQDN endpoints: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml index 2482d1bc05b..5fc22a83c59 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-custom-cookies.out.yaml @@ -140,7 +140,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml index caf951bcc40..4c64216743a 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-issuer.out.yaml @@ -97,7 +97,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml index 319d6bcfe58..d5025efe61f 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc-invalid-secretref.out.yaml @@ -281,7 +281,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -300,7 +300,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -319,7 +319,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml index 5f327af8752..f734ebb8e4e 100644 --- a/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-oidc.out.yaml @@ -235,7 +235,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false diff --git a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml index 7a4f2288ace..dd468f29511 100644 --- a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml @@ -166,7 +166,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10090 routes: @@ -193,7 +193,7 @@ xdsIR: - name: envoy-gateway/tls-secret-1 privateKey: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ2QwZlBDYWtweE1nUnUKT0VXQjFiQk5FM3ZseW55aTZWbkV2VWF1OUhvakR2UHVPTFJIaGI4MmoyY1ovMHhnL1lKR09LelBuV2JERkxGNApHdWh3dDRENmFUR0xYNklPODEwTDZ0SXZIWGZNUXRJS2VwdTZ3K3p1WVo4bG1yejB1RjZlWEtqamVIbHhyb2ZrCnVNekM3OUVaU0lYZlZlczJ1SmdVRSs4VGFzSDUzQ2Y4MFNSRGlIeEdxckttdVNjWCtwejBreGdCZ1VWYTVVS20KUWdTZDFmVUxLOUEwNXAxOXkrdURPM204bVhRNkxVQ0N1STFwZHNROGFlNS9zamlxa0VjWlJjMTdWYVgxWjVVaQpvcGZnNW9SY05VTG9VTHNiek9aNTR0YlVDUmdSV2VLbGZxaElINEZ6OUlkVlUyR3dFdEdhMmV6TjgyMVBaQ3QzCjZhbVRIelJsQWdNQkFBRUNnZ0VBWTFGTUlLNDVXTkVNUHJ6RTZUY3NNdVV2RkdhQVZ4bVk5NW5SMEtwajdvb3IKY21CVys2ZXN0TTQ4S1AwaitPbXd3VFpMY29Cd3VoWGN0V1Bob1lXcDhteWUxRUlEdjNyaHRHMDdocEQ1NGg2dgpCZzh3ejdFYStzMk9sT0N6UnlKNzBSY281YlhjWDNGaGJjdnFlRWJwaFFyQnpOSEtLMjZ4cmZqNWZIT3p6T1FGCmJHdUZ3SDVic3JGdFhlajJXM3c4eW90N0ZQSDV3S3RpdnhvSWU5RjMyOXNnOU9EQnZqWnpiaG1LVTArckFTK1kKRGVield2bFJyaEUrbXVmQTN6M0N0QXhDOFJpNzNscFNoTDRQQWlvcG1SUXlxZXRXMjYzOFFxcnM0R3hnNzhwbApJUXJXTmNBc2s3Slg5d3RZenV6UFBXSXRWTTFscFJiQVRhNTJqdFl2NVFLQmdRRE5tMTFtZTRYam1ZSFV2cStZCmFTUzdwK2UybXZEMHVaOU9JeFluQnBWMGkrckNlYnFFMkE1Rm5hcDQ5Yld4QTgwUElldlVkeUpCL2pUUkoxcVMKRUpXQkpMWm1LVkg2K1QwdWw1ZUtOcWxFTFZHU0dCSXNpeE9SUXpDZHBoMkx0UmtBMHVjSVUzY3hiUmVMZkZCRQpiSkdZWENCdlNGcWd0VDlvZTFldVpMVmFOd0tCZ1FERWdENzJENk81eGIweEQ1NDQ1M0RPMUJhZmd6aThCWDRTCk1SaVd2LzFUQ0w5N05sRWtoeXovNmtQd1owbXJRcE5CMzZFdkpKZFVteHdkU2MyWDhrOGcxMC85NVlLQkdWQWoKL3d0YVZYbE9WeEFvK0ZSelpZeFpyQ29uWWFSMHVwUzFybDRtenN4REhlZU9mUVZUTUgwUjdZN0pnbTA5dXQ4SwplanAvSXZBb1F3S0JnQjNaRWlRUWhvMVYrWjBTMlpiOG5KS0plMy9zMmxJTXFHM0ZkaS9RS3Q0eWViQWx6OGY5ClBZVXBzRmZEQTg5Z3grSU1nSm5sZVptdTk2ZnRXSjZmdmJSenllN216TG5zZU05TXZua1lHbGFGWmJRWnZubXMKN3ZoRmtzY3dHRlh4d21GMlBJZmU1Z3pNMDRBeVdjeTFIaVhLS2dNOXM3cGsxWUdyZGowZzdacmRBb0dCQUtLNApDR3MrbkRmMEZTMFJYOWFEWVJrRTdBNy9YUFhtSG5YMkRnU1h5N0Q4NTRPaWdTTWNoUmtPNTErbVNJejNQbllvCk41T1FXM2lHVVl1M1YvYmhnc0VSUzM1V2xmRk9BdDBzRUR5bjF5SVdXcDF5dG93d3BUNkVvUXVuZ2NYZjA5RjMKS1NROXowd3M4VmsvRWkvSFVXcU5LOWFXbU51cmFaT0ZqL2REK1ZkOUFvR0FMWFN3dEE3K043RDRkN0VEMURSRQpHTWdZNVd3OHFvdDZSdUNlNkpUY0FnU3B1MkhNU3JVY2dXclpiQnJZb09FUnVNQjFoMVJydk5ybU1qQlM0VW9FClgyZC8vbGhpOG1wL2VESWN3UDNRa2puanBJRFJWMFN1eWxrUkVaZURKZjVZb3R6eDdFdkJhbzFIbkQrWEg4eUIKVUtmWGJTaHZKVUdhRmgxT3Q1Y3JoM1k9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K serverCertificate: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUREVENDQWZXZ0F3SUJBZ0lVRUZNaFA5ZUo5WEFCV3NRNVptNmJSazJjTE5Rd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF3d0xabTl2TG1KaGNpNWpiMjB3SGhjTk1qUXdNakk1TURrek1ERXdXaGNOTXpRdwpNakkyTURrek1ERXdXakFXTVJRd0VnWURWUVFEREF0bWIyOHVZbUZ5TG1OdmJUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKbEk2WXhFOVprQ1BzNnBDUXhickNtZWl4OVA1RGZ4OVJ1NUxENFQKSm1kVzdJS2R0UVYvd2ZMbXRzdTc2QithVGRDaldlMEJUZmVPT1JCYlIzY1BBRzZFbFFMaWNsUVVydW4zcStncwpKcEsrSTdjSStqNXc4STY4WEg1V1E3clZVdGJ3SHBxYncrY1ZuQnFJVU9MaUlhdGpJZjdLWDUxTTF1RjljZkVICkU0RG5jSDZyYnI1OS9SRlpCc2toeHM1T3p3Sklmb2hreXZGd2V1VHd4Sy9WcGpJKzdPYzQ4QUJDWHBOTzlEL3EKRWgrck9hdWpBTWNYZ0hRSVRrQ2lpVVRjVW82TFNIOXZMWlB0YXFmem9acTZuaE1xcFc2NUUxcEF3RjNqeVRUeAphNUk4SmNmU0Zqa2llWjIwTFVRTW43TThVNHhIamFvL2d2SDBDQWZkQjdSTFUyc0NBd0VBQWFOVE1GRXdIUVlEClZSME9CQllFRk9SQ0U4dS8xRERXN2loWnA3Y3g5dFNtUG02T01COEdBMVVkSXdRWU1CYUFGT1JDRTh1LzFERFcKN2loWnA3Y3g5dFNtUG02T01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRnQ1M3pqc3FUYUg1YThFMmNodm1XQWdDcnhSSzhiVkxNeGl3TkdqYm1FUFJ6K3c2TngrazBBOEtFY0lEc0tjClNYY2k1OHU0b1didFZKQmx6YS9adWpIUjZQMUJuT3BsK2FveTc4NGJiZDRQMzl3VExvWGZNZmJCQ20xdmV2aDkKQUpLbncyWnRxcjRta2JMY3hFcWxxM3NCTEZBUzlzUUxuS05DZTJjR0xkVHAyYm9HK3FjZ3lRZ0NJTTZmOEVNdgpXUGlmQ01NR3V6Sy9HUkY0YlBPL1lGNDhld0R1M1VlaWgwWFhkVUFPRTlDdFVhOE5JaGMxVVBhT3pQcnRZVnFyClpPR2t2L0t1K0I3OGg4U0VzTzlYclFjdXdiT25KeDZLdFIrYWV5a3ZBcFhDUTNmWkMvYllLQUFSK1A4QUpvUVoKYndJVW1YaTRnajVtK2JLUGhlK2lyK0U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0= - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls-hostname port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml index 29a124844e5..5bf2c388a30 100644 --- a/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-with-backend.out.yaml @@ -112,7 +112,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tcp port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml index a3dc7519ecd..12021806303 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -94,7 +94,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index 5a065e6d6bb..802c84636ad 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -128,7 +128,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10091 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml index 97bce6d0acf..48e11662a57 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backend.out.yaml @@ -114,7 +114,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index 1f8515c6532..072357e7937 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10090 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml index 09664c0e41c..dbb35bfecef 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -93,7 +93,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10091 routes: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml index d40d0927396..f696db74016 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -95,7 +95,7 @@ xdsIR: text: - path: /dev/stdout tcp: - - address: 0.0.0.0 + - address: '::' name: envoy-gateway/gateway-1/tls port: 10091 routes: diff --git a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml index 9c0610b4051..4ed723d6985 100644 --- a/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-merged-multiple-routes.out.yaml @@ -230,7 +230,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -265,7 +265,7 @@ xdsIR: distinct: false name: "" prefix: / - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -279,7 +279,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8888 - - address: 0.0.0.0 + - address: '::' hostnames: - example.com isHTTP2: false diff --git a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml index 4bd1415e464..d51b333e647 100644 --- a/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/tracing-multiple-routes.out.yaml @@ -255,7 +255,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*.envoyproxy.io' isHTTP2: false @@ -311,7 +311,7 @@ xdsIR: text: - path: /dev/stdout http: - - address: 0.0.0.0 + - address: '::' hostnames: - '*' isHTTP2: false @@ -325,7 +325,7 @@ xdsIR: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 8888 - - address: 0.0.0.0 + - address: '::' hostnames: - example.com isHTTP2: false 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/utils/net/ip.go b/internal/utils/net/ip.go new file mode 100644 index 00000000000..4c496936801 --- /dev/null +++ b/internal/utils/net/ip.go @@ -0,0 +1,10 @@ +// Copyright Envoy Gateway Authors +// SPDX-License-Identifier: Apache-2.0 +// The full text of the Apache license is available in the LICENSE file at +// the root of the repo. + +package net + +const ( + IPv6ListenerAddress = "::" +) diff --git a/internal/xds/translator/accesslog.go b/internal/xds/translator/accesslog.go index 076eb659d83..265e3ed8a9c 100644 --- a/internal/xds/translator/accesslog.go +++ b/internal/xds/translator/accesslog.go @@ -6,7 +6,6 @@ package translator import ( - "errors" "sort" "strings" @@ -545,7 +544,7 @@ func processClusterForAccessLog(tCtx *types.ResourceVersionTable, al *ir.AccessL backendConnection: traffic.BackendConnection, dns: traffic.DNS, http2Settings: traffic.HTTP2, - }); err != nil && !errors.Is(err, ErrXdsClusterExists) { + }); err != nil { return err } } @@ -573,7 +572,7 @@ func processClusterForAccessLog(tCtx *types.ResourceVersionTable, al *ir.AccessL backendConnection: traffic.BackendConnection, dns: traffic.DNS, http2Settings: traffic.HTTP2, - }); err != nil && !errors.Is(err, ErrXdsClusterExists) { + }); err != nil { return err } } diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go index 5a13076e456..c5064c29eef 100644 --- a/internal/xds/translator/cluster.go +++ b/internal/xds/translator/cluster.go @@ -84,9 +84,16 @@ func buildEndpointType(settings []*ir.DestinationSetting) EndpointType { } func buildXdsCluster(args *xdsClusterArgs) *clusterv3.Cluster { - dnsLookupFamily := clusterv3.Cluster_V4_ONLY - if args.ipFamily != nil && *args.ipFamily == egv1a1.DualStack { - dnsLookupFamily = clusterv3.Cluster_ALL + dnsLookupFamily := clusterv3.Cluster_V4_PREFERRED + if args.ipFamily != nil { + switch *args.ipFamily { + case egv1a1.IPv4: + dnsLookupFamily = clusterv3.Cluster_V4_ONLY + case egv1a1.IPv6: + dnsLookupFamily = clusterv3.Cluster_V6_ONLY + case egv1a1.DualStack: + dnsLookupFamily = clusterv3.Cluster_ALL + } } cluster := &clusterv3.Cluster{ Name: args.name, diff --git a/internal/xds/translator/extauth.go b/internal/xds/translator/extauth.go index 7d7cc6a7227..2f8766fe91c 100644 --- a/internal/xds/translator/extauth.go +++ b/internal/xds/translator/extauth.go @@ -226,14 +226,12 @@ func (*extAuth) patchResources(tCtx *types.ResourceVersionTable, } if route.Security.ExtAuth.HTTP != nil { if err := createExtServiceXDSCluster( - &route.Security.ExtAuth.HTTP.Destination, route.Security.ExtAuth.Traffic, tCtx); err != nil && !errors.Is( - err, ErrXdsClusterExists) { + &route.Security.ExtAuth.HTTP.Destination, route.Security.ExtAuth.Traffic, tCtx); err != nil { errs = errors.Join(errs, err) } } else { if err := createExtServiceXDSCluster( - &route.Security.ExtAuth.GRPC.Destination, route.Security.ExtAuth.Traffic, tCtx); err != nil && !errors.Is( - err, ErrXdsClusterExists) { + &route.Security.ExtAuth.GRPC.Destination, route.Security.ExtAuth.Traffic, tCtx); err != nil { errs = errors.Join(errs, err) } } diff --git a/internal/xds/translator/extproc.go b/internal/xds/translator/extproc.go index 2bc6c4b6ba6..57cc9634d09 100644 --- a/internal/xds/translator/extproc.go +++ b/internal/xds/translator/extproc.go @@ -173,8 +173,7 @@ func (*extProc) patchResources(tCtx *types.ResourceVersionTable, for i := range route.EnvoyExtensions.ExtProcs { ep := route.EnvoyExtensions.ExtProcs[i] if err := createExtServiceXDSCluster( - &ep.Destination, ep.Traffic, tCtx); err != nil && !errors.Is( - err, ErrXdsClusterExists) { + &ep.Destination, ep.Traffic, tCtx); err != nil { errs = errors.Join(errs, err) } } diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go index 9a68c5f3c1f..098cc896145 100644 --- a/internal/xds/translator/listener.go +++ b/internal/xds/translator/listener.go @@ -146,42 +146,11 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin return extensionConfig } -func setAddressByIPFamily(socketAddress *corev3.SocketAddress, ipFamily *ir.IPFamily, port uint32) []*listenerv3.AdditionalAddress { - if ipFamily == nil { - return nil - } - switch *ipFamily { - case ir.IPv4: - socketAddress.Address = "0.0.0.0" - case ir.IPv6: - socketAddress.Address = "::" - case ir.Dualstack: - socketAddress.Address = "0.0.0.0" - return []*listenerv3.AdditionalAddress{ - { - Address: &corev3.Address{ - Address: &corev3.Address_SocketAddress{ - SocketAddress: &corev3.SocketAddress{ - Protocol: socketAddress.Protocol, - Address: "::", - PortSpecifier: &corev3.SocketAddress_PortValue{ - PortValue: port, - }, - }, - }, - }, - }, - } - } - return nil -} - // buildXdsTCPListener creates a xds Listener resource // TODO: Improve function parameters func buildXdsTCPListener( name, address string, port uint32, - ipFamily *ir.IPFamily, keepalive *ir.TCPKeepalive, connection *ir.ClientConnection, accesslog *ir.AccessLog, @@ -205,13 +174,12 @@ func buildXdsTCPListener( PortSpecifier: &corev3.SocketAddress_PortValue{ PortValue: port, }, + Ipv4Compat: true, }, }, }, } - socketAddress := listener.Address.GetSocketAddress() - listener.AdditionalAddresses = setAddressByIPFamily(socketAddress, ipFamily, port) return listener, nil } @@ -239,6 +207,7 @@ func buildXdsQuicListener(name, address string, port uint32, accesslog *ir.Acces PortSpecifier: &corev3.SocketAddress_PortValue{ PortValue: port, }, + Ipv4Compat: true, }, }, }, @@ -880,6 +849,7 @@ func buildXdsUDPListener(clusterName string, udpListener *ir.UDPListener, access PortSpecifier: &corev3.SocketAddress_PortValue{ PortValue: udpListener.Port, }, + Ipv4Compat: true, }, }, }, diff --git a/internal/xds/translator/oidc.go b/internal/xds/translator/oidc.go index a706cae662f..c51bbd75499 100644 --- a/internal/xds/translator/oidc.go +++ b/internal/xds/translator/oidc.go @@ -310,8 +310,7 @@ func createOAuthServerClusters(tCtx *types.ResourceVersionTable, // If the OIDC provider has a destination, use it. if oidc.Provider.Destination != nil && len(oidc.Provider.Destination.Settings) > 0 { if err := createExtServiceXDSCluster( - oidc.Provider.Destination, oidc.Provider.Traffic, tCtx); err != nil && !errors.Is( - err, ErrXdsClusterExists) { + oidc.Provider.Destination, oidc.Provider.Traffic, tCtx); err != nil { errs = errors.Join(errs, err) } } else { @@ -372,11 +371,7 @@ func createOAuth2TokenEndpointCluster(tCtx *types.ResourceVersionTable, clusterArgs.tSocket = tSocket } - if err = addXdsCluster(tCtx, clusterArgs); err != nil && !errors.Is(err, ErrXdsClusterExists) { - return err - } - - return err + return addXdsCluster(tCtx, clusterArgs) } // createOAuth2Secrets creates OAuth2 client and HMAC secrets from the provided diff --git a/internal/xds/translator/ratelimit.go b/internal/xds/translator/ratelimit.go index 06b37bc4589..eb6a1c4a2cd 100644 --- a/internal/xds/translator/ratelimit.go +++ b/internal/xds/translator/ratelimit.go @@ -7,7 +7,6 @@ package translator import ( "bytes" - "errors" "net/url" "strconv" "strings" @@ -492,17 +491,13 @@ func (t *Translator) createRateLimitServiceCluster(tCtx *types.ResourceVersionTa return err } - if err := addXdsCluster(tCtx, &xdsClusterArgs{ + return addXdsCluster(tCtx, &xdsClusterArgs{ name: clusterName, settings: []*ir.DestinationSetting{ds}, tSocket: tSocket, endpointType: EndpointTypeDNS, metrics: metrics, - }); err != nil && !errors.Is(err, ErrXdsClusterExists) { - return err - } - - return nil + }) } func getRouteRuleDescriptor(ruleIndex, matchIndex int) string { diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml index 77ced570f46..6a5d283ee44 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/extensionpolicy-tcp-udp-http.yaml @@ -35,6 +35,15 @@ http: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true port: 10080 + routes: + - name: "http-route" + hostname: "*" + destination: + name: "http-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 tcp: - address: 0.0.0.0 extensionRefs: @@ -66,6 +75,13 @@ tcp: controllerName: gateway.envoyproxy.io/gatewayclass-controller name: envoy-gateway/gateway-1/tcp1 port: 10080 + routes: + - destination: + name: "tcp-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 udp: - address: 0.0.0.0 route: diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml index 405c2372d91..8a0497c3fb8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-cel.yaml @@ -35,7 +35,7 @@ accesslog: protocol: "GRPC" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml index 2355c6504cf..623c3b6d594 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-endpoint-stats.yaml @@ -31,7 +31,7 @@ accesslog: protocol: "GRPC" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml index e4e088d349b..4ba42ea82bb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-formatters.yaml @@ -39,7 +39,7 @@ accesslog: protocol: "GRPC" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml index 10768da4354..8c8161e2e33 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-invalid.yaml @@ -27,7 +27,7 @@ accesslog: port: 4317 http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml index 95b4971cd39..d84151866f2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-multi-cel.yaml @@ -39,7 +39,7 @@ accesslog: protocol: "GRPC" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml index 434f2fb524c..1492b397569 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog-without-format.yaml @@ -44,7 +44,7 @@ accesslog: protocol: "GRPC" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml index 3f84816fdcf..38d5e8a74be 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml @@ -53,7 +53,7 @@ accesslog: protocol: "GRPC" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml index 493180389ad..4cb9541775b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/backend-buffer-limit.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -21,7 +21,7 @@ http: bufferLimit: 100000000 tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" connection: bufferLimit: 1500 port: 10081 @@ -37,7 +37,7 @@ tcp: bufferLimit: 100000000 udp: - name: "udp-route" - address: "0.0.0.0" + address: "::" port: 10080 route: name: "udp-route" diff --git a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml index f4dd3bbaa99..1eb6f7b7010 100644 --- a/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/circuit-breaker.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml index c7af759ecf9..6604d37dc47 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-buffer-limit.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -20,7 +20,7 @@ http: bufferLimit: 1500 tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" connection: bufferLimit: 1500 port: 10081 diff --git a/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml b/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml index de3236a8622..1894902a0ba 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-ip-detection.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 8081 hostnames: - "*" @@ -17,7 +17,7 @@ http: xForwardedFor: numTrustedHops: 2 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 8082 hostnames: - "*" @@ -35,7 +35,7 @@ http: name: "x-my-custom-header" failClosed: false - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 8083 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml index 741f2d46451..6ce11179029 100644 --- a/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/client-timeout.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -22,7 +22,7 @@ http: idleTimeout: "10s" tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 routes: - name: "second-route" diff --git a/internal/xds/translator/testdata/in/xds-ir/cors.yaml b/internal/xds/translator/testdata/in/xds-ir/cors.yaml index 0e046110a00..2d7fedf0513 100644 --- a/internal/xds/translator/testdata/in/xds-ir/cors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/cors.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml index 39b351eb6ec..163e3507cae 100644 --- a/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/fault-injection.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 path: mergeSlashes: true diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-x-request-id.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-x-request-id.yaml index 1376be42e14..d2599bc005c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-x-request-id.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-preserve-x-request-id.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 8081 hostnames: - "*" @@ -16,7 +16,7 @@ http: headers: preserveXRequestID: true - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 8082 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml b/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml index 53b7076925c..0787ec0780a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/headers-with-underscores-action.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 8081 hostnames: - "*" @@ -14,7 +14,7 @@ http: - host: "1.1.1.1" port: 8081 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 8082 hostnames: - "*" @@ -30,7 +30,7 @@ http: headers: withUnderscoresAction: Allow - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 8083 hostnames: - "*" @@ -46,7 +46,7 @@ http: headers: withUnderscoresAction: RejectRequest - name: "fourth-listener" - address: "0.0.0.0" + address: "::" port: 8084 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml index 12f62f86414..b78270a421a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/health-check.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" path: mergeSlashes: true escapedSlashesAction: UnescapeAndRedirect diff --git a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml index 6301153cd1c..84b0e2f5673 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-early-header-mutation.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -19,7 +19,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml index 12fc177bde8..076e1427e39 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-endpoint-stats.yaml @@ -3,7 +3,7 @@ metrics: enablePerEndpointStats: true http: - name: "listener-enable-endpoint-stats" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml index a4bdd70a384..2a22775b7c0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-health-check.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml index 5c174e363ef..3831d1a6bd4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-req-resp-sizes-stats.yaml @@ -3,7 +3,7 @@ metrics: enableRequestResponseSizesStats: true http: - name: "listener-enable-req-resp-sizes-stats" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml index 9db15c7fb9d..c51cf53a389 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml index 1cb0be3ec26..12986c3ed86 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-dns-cluster.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml index b00449b384f..5d000b85bdf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml index 3d13de381be..02724f765d7 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-multiple-mirrors.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml index d72ec1d2c68..ad06367ef75 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-partial-invalid.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml index 1c541a9caac..dd2a5aaeb1c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml index d9558ad99a2..cfa271c3e98 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-regex.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml index fb45b8db724..7bd5a5013cf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml index 3cfaf5e4945..c27f02da065 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml index c97d927dff6..d04cc086e90 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml index f7b30b3d7d6..8ecd2bb4c74 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml index f4307644514..97e92bd1f25 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-root-path-url-prefix.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml index 97d0b5457cd..3dce5f3d6a9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml index 4d08acb93ee..a3c9eef83cf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml index 525a22210b9..7e971a596c6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml index df4f2e9c2bf..de751b8680b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-prefix.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml index 0389201186e..531ac4a2941 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-regex.yaml @@ -1,7 +1,7 @@ name: "http-route" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml index 536c5ad50cb..d5cfffa0e4b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-session-persistence.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml index 746d4922542..b3ab173f745 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-timeout.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml index 711913d4dfd..90bf39f5ad0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-uds-ip.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml index 8745e9893bc..5789434790e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend-with-filters.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" hostnames: - '*' path: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml index 2540dec625a..3a3df9cd596 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml index d883bac1fa1..c342dc30383 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml index 0c89d5a1840..dff106a6ff1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml index f857ac8f854..1b6382fc71a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-preserve-case.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -19,7 +19,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml index 51174744979..83fa599cfd0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http1-trailers.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http10.yaml b/internal/xds/translator/testdata/in/xds-ir/http10.yaml index 47f57a04422..fea6bafa0e5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http10.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http10.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml index 5d271080918..1f11535ee18 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/http2.yaml b/internal/xds/translator/testdata/in/xds-ir/http2.yaml index c95bc0442c0..ffa5e487a7a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml index 9c248772920..8d78880b81b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-empty-jsonpath.yaml @@ -28,7 +28,7 @@ envoyPatchPolicies: region: second-route-dest/backend/0 http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml index b4659755214..2dea53dcc3c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml @@ -33,7 +33,7 @@ envoyPatchPolicies: path: "/virtual_hosts/0/rate_limits" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml index 551bdd6dda6..70ae0f10710 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-patch.yaml @@ -28,7 +28,7 @@ envoyPatchPolicies: transport_api_version: V3 http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml index 3f50ddf7aaf..f10bf20addc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-missing-resource.yaml @@ -28,7 +28,7 @@ envoyPatchPolicies: transport_api_version: V3 http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml index d66eaa633db..dd586aec3ea 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-move-op-with-value.yaml @@ -36,7 +36,7 @@ envoyPatchPolicies: test: "abc" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml index 5b677788a22..9b0d7b4937b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath-invalid.yaml @@ -17,7 +17,7 @@ envoyPatchPolicies: value: "50" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml index a02cad99d67..34ca0aff98c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch-with-jsonpath.yaml @@ -121,7 +121,7 @@ envoyPatchPolicies: path: "/endpoints/0/load_balancing_weight" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml index 1aa76efdfab..04b88fca088 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jsonpatch.yaml @@ -109,7 +109,7 @@ envoyPatchPolicies: path: "/endpoints/0/load_balancing_weight" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml index 8d24373fd6a..1f0ff2189ec 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-custom-extractor.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml index 88f88f5aa35..3d52645831e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-multi-provider.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml index 324f54d9311..1e0a31975d4 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-multi-route-single-provider.yaml @@ -3,7 +3,7 @@ accesslog: - path: "/dev/stdout" http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml index b43dd005257..7ab85e6928e 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-optional.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml index 008b5b9bde6..18957afe903 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-ratelimit.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml index a5b72e0ff53..4df3cf34798 100644 --- a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml index 049ec905b9a..b758db9918b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-connection-limit.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" @@ -18,7 +18,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 hostnames: - "foo.net" @@ -39,31 +39,33 @@ http: port: 50000 tcp: - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 10082 connection: limit: value: 3 - tls: - passthrough: - snis: - - bar.com - destination: - name: "tls-route-dest" - settings: - - endpoints: - - host: "1.2.3.4" - port: 50000 + routes: + - tls: + inspector: + snis: + - bar.com + destination: + name: "tls-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 - name: "fourth-listener" - address: "0.0.0.0" + address: "::" connection: limit: value: 10 closeDelay: 3s port: 10083 - destination: - name: "tcp-route-dest" - settings: - - endpoints: - - host: "1.2.3.4" - port: 50000 + routes: + - destination: + name: "tcp-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml index 35f4e744093..f9f26a8103a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-proxy-protocol.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" @@ -32,7 +32,7 @@ http: port: 50000 tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 enableProxyProtocol: true routes: diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml index 9bdaf244912..e9da0aa245f 100644 --- a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-keepalive.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" @@ -18,7 +18,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 hostnames: - "foo.net" @@ -40,27 +40,29 @@ http: port: 50000 tcp: - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 10082 tcpKeepalive: {} - tls: - inspector: - snis: - - bar.com - destination: - name: "tls-route-dest" - settings: - - endpoints: - - host: "1.2.3.4" - port: 50000 + routes: + - tls: + inspector: + snis: + - bar.com + destination: + name: "tls-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 - name: "fourth-listener" - address: "0.0.0.0" + address: "::" tcpKeepalive: probes: 10 port: 10083 - destination: - name: "tcp-route-dest" - settings: - - endpoints: - - host: "1.2.3.4" - port: 50000 + routes: + - destination: + name: "tcp-route-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml new file mode 100644 index 00000000000..cc24bfbdf00 --- /dev/null +++ b/internal/xds/translator/testdata/in/xds-ir/listener-tcp-without-route.yaml @@ -0,0 +1,17 @@ +tcp: +- address: 0.0.0.0 + connection: + bufferLimit: 50000000 + limit: + closeDelay: 10s + value: 3 + enableProxyProtocol: true + name: envoy-gateway/gateway-1/tls-1 + port: 10443 + tcpKeepalive: + idleTime: 1200 + interval: 60 + probes: 3 + timeout: + tcp: + idleTimeout: 20m0s diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml index d2b754bf16b..17a09c845b5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml index fb7baf05cd6..8299d0f0823 100644 --- a/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/local-ratelimit.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml index 39f1a23dc7f..e326e5667cf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/metrics-virtual-host.yaml @@ -3,7 +3,7 @@ metrics: enableVirtualHostStats: true http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml index e77e1262245..e1d7f0658fb 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mixed-tls-jwt-authn.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml index b694ac5aab0..3aca8e48b0b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" @@ -27,7 +27,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.net" @@ -54,7 +54,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "example.com" @@ -71,7 +71,7 @@ http: - host: "1.2.3.4" port: 50000 - name: "fourth-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "example.net" @@ -89,7 +89,7 @@ http: port: 50000 tcp: - name: "fifth-listener" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "fifth-route" @@ -104,7 +104,7 @@ tcp: - host: "1.2.3.4" port: 50000 - name: "sixth-listener" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "sixth-route" diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml index 19ad6357e9a..ba1eff21400 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-simple-tcp-route-same-port.yaml @@ -1,6 +1,6 @@ tcp: - name: "tcp-listener-simple" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple" @@ -13,7 +13,7 @@ tcp: - host: "5.6.7.8" port: 50001 - name: "tcp-listener-simple-1" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple-1" @@ -26,7 +26,7 @@ tcp: - host: "5.6.7.8" port: 50001 - name: "tcp-listener-simple-2" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple-2" @@ -39,7 +39,7 @@ tcp: - host: "5.6.7.8" port: 50001 - name: "tcp-listener-simple-3" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple-3" @@ -52,7 +52,7 @@ tcp: - host: "5.6.7.8" port: 50001 - name: "tcp-listener-simple-4" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple-4" diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml index aac60cf7c41..b975466c27a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10001 hostnames: - "*" @@ -36,7 +36,7 @@ http: - host: "10.0.0.1" port: 10001 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10002 hostnames: - "*" @@ -73,7 +73,7 @@ http: - host: "10.0.0.1" port: 10002 - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 10003 hostnames: - "*" @@ -111,7 +111,7 @@ http: - host: "10.0.0.1" port: 10003 - name: "fourth-listener" - address: "0.0.0.0" + address: "::" port: 10004 hostnames: - "*" @@ -151,7 +151,7 @@ http: - host: "10.0.0.1" port: 10004 - name: "fifth-listener" - address: "0.0.0.0" + address: "::" port: 10005 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml index 72eaea1f58e..5f50492e526 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-forward-client-certificate.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10001 hostnames: - "*" @@ -36,7 +36,7 @@ http: - host: "10.0.0.1" port: 10001 - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10002 hostnames: - "*" @@ -72,7 +72,7 @@ http: - host: "10.0.0.1" port: 10002 - name: "third-listener" - address: "0.0.0.0" + address: "::" port: 10003 hostnames: - "*" @@ -108,7 +108,7 @@ http: - host: "10.0.0.1" port: 10003 - name: "fourth-listener" - address: "0.0.0.0" + address: "::" port: 10004 hostnames: - "*" @@ -144,7 +144,7 @@ http: - host: "10.0.0.1" port: 10004 - name: "fifth-listener" - address: "0.0.0.0" + address: "::" port: 10005 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml index 61f67998deb..cfe94ba32f3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls-required-client-certificate-disabled.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -35,7 +35,7 @@ http: port: 50000 tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 tls: certificates: diff --git a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml index 01103c9e5ec..d4ba0f617e9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/mutual-tls.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" @@ -35,7 +35,7 @@ http: port: 50000 tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 tls: certificates: diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml index 6fc9a045bca..993f775947a 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc-backend-cluster-provider.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml index 828da7c2fb1..c2e75b916d0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/oidc.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/oidc.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml index 1eddbaab253..e3752799fc6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/path-settings.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml index 47df0026b9f..c1e4c9dd632 100644 --- a/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/proxy-protocol-upstream.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml index 271d39cfdcb..663dda6eb06 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml index 7c48e227ecc..56028c4162c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml index 32f95117283..d7e2dea2ac1 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-endpoint-stats.yaml @@ -2,7 +2,7 @@ metrics: enablePerEndpointStats: true http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml index fa9b6f31ae5..d6b6a9b3245 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-headers-and-cidr.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml index 495fa9b7a1f..289104b1df3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml index 2279315caed..7af166fca4d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml index 7483356722d..cb883565f8c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/retry-partial-invalid.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml b/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml new file mode 100644 index 00000000000..0c0d820db63 --- /dev/null +++ b/internal/xds/translator/testdata/in/xds-ir/securitypolicy-with-oidc-jwt-authz.yaml @@ -0,0 +1,80 @@ +http: +- name: "envoy-gateway/gateway-1/http" + address: 0.0.0.0 + hostnames: + - '*' + isHTTP2: false + metadata: + kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + path: + escapedSlashesAction: UnescapeAndRedirect + mergeSlashes: true + port: 10080 + routes: + - destination: + name: httproute/default/httproute-1/rule/0 + settings: + - addressType: IP + endpoints: + - host: 7.7.7.7 + port: 8080 + protocol: HTTP + weight: 1 + hostname: www.example.com + isHTTP2: false + metadata: + kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0/match/0/www_example_com + pathMatch: + distinct: false + name: "" + prefix: /foo + security: + authorization: + defaultAction: Deny + rules: + - action: Allow + name: allow + principal: + jwt: + claims: + - name: groups + valueType: StringArray + values: + - foobar + provider: exjwt + jwt: + providers: + - claimToHeaders: + - claim: email + header: x-user-email + extractFrom: + cookies: + - IdToken + issuer: https://oidc.example.com/auth/realms/example + name: exjwt + remoteJWKS: + uri: https://oidc.example.com/auth/realms/example/protocol/openid-connect/certs + oidc: + clientID: prometheus + clientSecret: 'qrOYACHXoe7UEDI/raOjNSx+Z9ufXSc/22C3T6X/zPY=' + cookieNameOverrides: + idToken: IdToken + cookieSuffix: 5f93c2e4 + hmacSecret: 'qrOYACHXoe7UEDI/raOjNSx+Z9ufXSc/22C3T6X/zPY=' + logoutPath: /logout + name: securitypolicy/default/policy-for-http-route + provider: + authorizationEndpoint: https://oidc.example.com/authorize + tokenEndpoint: https://oidc.example.com/oauth/token + redirectPath: /oauth2/callback + redirectURL: '%REQ(x-forwarded-proto)%://%REQ(:authority)%/oauth2/callback' + scopes: + - openid + - email + - profile diff --git a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml index 7309020334a..fd1408fdf2d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml index f26d13b084e..d01294ed199 100644 --- a/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/suppress-envoy-headers.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "foo.com" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml index 60176773c96..28ee60724bf 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-endpoint-stats.yaml @@ -3,13 +3,14 @@ metrics: enablePerEndpointStats: true tcp: - name: "tcp-route-enable-endpoint-stats" - address: "0.0.0.0" + address: "::" port: 10080 - destination: - name: "tcp-route-simple-dest" - settings: - - endpoints: - - host: "1.2.3.4" - port: 50000 - - host: "5.6.7.8" - port: 50001 + routes: + - destination: + name: "tcp-route-simple-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + - host: "5.6.7.8" + port: 50001 diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml index 6d5d7fac73c..1b915c58433 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-req-resp-sizes-stats.yaml @@ -3,13 +3,14 @@ metrics: enableRequestResponseSizesStats: true tcp: - name: "tcp-route-enable-req-resp-sizes-stats" - address: "0.0.0.0" + address: "::" port: 10080 - destination: - name: "tcp-route-simple-dest" - settings: - - endpoints: - - host: "1.2.3.4" - port: 50000 - - host: "5.6.7.8" - port: 50001 + routes: + - destination: + name: "tcp-route-simple-dest" + settings: + - endpoints: + - host: "1.2.3.4" + port: 50000 + - host: "5.6.7.8" + port: 50001 diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml index 901c0f66f40..48f58cd84dc 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-complex.yaml @@ -1,6 +1,6 @@ tcp: - name: "tcp-listener-complex" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-complex" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml index 427472d6832..80511b12899 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-invalid-endpoint.yaml @@ -1,6 +1,6 @@ tcp: - name: "tcp-listener-simple" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml index 58f1ec03892..ae3ab3fc127 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-simple.yaml @@ -1,6 +1,6 @@ tcp: - name: "tcp-listener-simple" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-simple" diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml index 2acfdc391ea..86d0101d657 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-tls-terminate.yaml @@ -1,6 +1,6 @@ tcp: - name: "tls-listener-terminate" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tls-route-terminate" @@ -20,7 +20,7 @@ tcp: - host: "5.6.7.8" port: 50001 - name: "tls-terminate-hostname" - address: "0.0.0.0" + address: "::" port: 10080 tls: inspector: diff --git a/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml index 73081048864..2e5e133bc25 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tcp-route-weighted-backend.yaml @@ -1,6 +1,6 @@ tcp: - name: "tcp-listener-weighted-backend" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tcp-route-weighted-backend" diff --git a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml index 8abc0af3cdd..f33270a0dd5 100644 --- a/internal/xds/translator/testdata/in/xds-ir/timeout.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/timeout.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml index 285927c9017..54da9ebef28 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-route-passthrough.yaml @@ -1,6 +1,6 @@ tcp: - name: "tls-passthrough-foo" - address: "0.0.0.0" + address: "::" port: 10080 routes: - name: "tls-route-passthrough-foo" @@ -17,7 +17,7 @@ tcp: - host: "5.6.7.8" port: 50001 - name: "tls-passthrough-bar" - address: "0.0.0.0" + address: "::" port: 10081 routes: - name: "tls-route-passthrough-bar" diff --git a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml index afcf3322715..6e70e3afba0 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tls-with-ciphers-versions-alpn.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" path: escapedSlashesAction: UnescapeAndRedirect mergeSlashes: true @@ -51,7 +51,7 @@ http: port: 50000 tcp: - name: "second-listener" - address: "0.0.0.0" + address: "::" port: 10081 tls: ciphers: diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml index 1ed5b3aef3c..55c83e0bd0d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-datadog.yaml @@ -28,7 +28,7 @@ tracing: type: Datadog http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml index 1d8c4b7a338..c5ddea6b9ab 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-endpoint-stats.yaml @@ -33,7 +33,7 @@ tracing: type: OpenTelemetry http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml index d8b23c5d21e..3a9a50904f6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-invalid.yaml @@ -22,7 +22,7 @@ tracing: port: 4317 http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml index 02623bc0c7a..dad1fdba41b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-unknown-provider-type.yaml @@ -30,7 +30,7 @@ tracing: type: AwesomeTelemetry http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml index dded17dd193..52f559c907b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing-zipkin.yaml @@ -34,7 +34,7 @@ tracing: disableSharedSpanContext: true http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml index b5cccf6dbab..7762d44b525 100644 --- a/internal/xds/translator/testdata/in/xds-ir/tracing.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/tracing.yaml @@ -52,7 +52,7 @@ tracing: type: OpenTelemetry http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml index fc597f28928..9e27ffc95aa 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-endpoint-stats.yaml @@ -3,7 +3,7 @@ metrics: enablePerEndpointStats: true udp: - name: "udp-route-enable-endpoint-stats" - address: "0.0.0.0" + address: "::" port: 10080 route: name: "udp-route" diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml index 1e7e0d9fb53..39f7cf99cf2 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-req-resp-sizes-stats.yaml @@ -3,7 +3,7 @@ metrics: enableRequestResponseSizesStats: true udp: - name: "udp-route-enable-req-resp-sizes-stats" - address: "0.0.0.0" + address: "::" port: 10080 route: name: "udp-route" diff --git a/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml b/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml index a933bdd78a4..8f59089835b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/udp-route.yaml @@ -1,6 +1,6 @@ udp: - name: "udp-route" - address: "0.0.0.0" + address: "::" port: 10080 route: name: "udp-route" diff --git a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml index b00f5e55a3b..c66533226d8 100644 --- a/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/upstream-tcpkeepalive.yaml @@ -1,6 +1,6 @@ http: - name: "first-listener" - address: "0.0.0.0" + address: "::" port: 10080 hostnames: - "*" 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 cdbb352dd54..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,7 +4,43 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: http-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: http-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcp-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tcp-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.endpoints.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.endpoints.yaml index 8869685de5e..9308c055cfe 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.endpoints.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.endpoints.yaml @@ -1,3 +1,27 @@ +- clusterName: http-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: http-route-dest/backend/0 +- clusterName: tcp-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcp-route-dest/backend/0 - clusterName: udp-route-dest endpoints: - lbEndpoints: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml index 6901c9c7810..026cd70e650 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -30,12 +31,20 @@ statPrefix: http-10080 useRemoteAddress: true name: envoy-gateway/gateway-1/http1 + filterChains: + - filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcp-route-dest + statPrefix: tcp-10080 name: envoy-gateway/gateway-1/http1 perConnectionBufferLimitBytes: 32768 statPrefix: envoy-gateway/gateway-1/http1 - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10162 protocol: UDP listenerFilters: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml index b03ec37faa6..bfcb22e483f 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.routes.yaml @@ -1,2 +1,14 @@ - ignorePortInHostMatching: true name: envoy-gateway/gateway-1/http1 + virtualHosts: + - domains: + - '*' + name: envoy-gateway/gateway-1/http1/* + routes: + - match: + prefix: / + name: http-route + route: + cluster: http-route-dest + upgradeConfigs: + - upgradeType: websocket 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 f986750be1b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml index e6777ebece3..507aaab00f5 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f986750be1b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml index c3fb113017a..9c25f196445 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml index 7837e1509fc..5b2e1a6719a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/listener-policy.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10081 defaultFilterChain: filters: 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 9696a28a86c..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,7 +5,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 15s - dnsLookupFamily: V4_ONLY + 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 22d5e08aca3..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml index d9795d2be43..1bb613cbfcd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.listeners.yaml @@ -82,7 +82,8 @@ stringValue: cluster1 address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 7709f2c4e9c..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -24,7 +24,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml index 6a7ebeda5c3..78d5f7abe9f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.listeners.yaml @@ -61,7 +61,8 @@ stringValue: cluster1 address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 22d5e08aca3..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml index cb6e3ef7759..2532b596f44 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.listeners.yaml @@ -105,7 +105,8 @@ stringValue: cluster1 address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 22d5e08aca3..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml index 3677e6bec6b..713a4137c31 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.listeners.yaml @@ -97,7 +97,8 @@ stringValue: cluster1 address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 5e41cf09397..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -47,7 +47,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,7 +72,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -97,7 +97,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -122,7 +122,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -147,7 +147,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -172,7 +172,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -206,7 +206,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -240,7 +240,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml index dbb30726378..8bdbfafa21e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.listeners.yaml @@ -142,6 +142,7 @@ address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 dbf145e7d6d..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -47,7 +47,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.listeners.yaml index 9df135e671c..27da99342c3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.listeners.yaml @@ -80,7 +80,8 @@ stringValue: cluster1 address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 dbf145e7d6d..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -47,7 +47,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml index 0ef9cdc5fab..c43406cbaea 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml @@ -80,7 +80,8 @@ stringValue: cluster1 address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 0002897cb8d..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml index 907d28f78b7..1a6a6c94ebf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f5211bc9922..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml index f34bcbe362f..c3144002dc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f5211bc9922..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml index f34bcbe362f..c3144002dc5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 1c72d4f070f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml index 907d28f78b7..1a6a6c94ebf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 e36a7f976be..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml index 1fadbe977d8..39d16f0162e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -34,7 +35,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: @@ -48,7 +50,8 @@ perConnectionBufferLimitBytes: 1500 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 protocol: UDP listenerFilters: 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 4088295c2de..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml index 55e2fde715b..fec7e1ade2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 1c7cbaf45e0..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml index a7accc0ef6c..3f5b5976eb0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 93e5ebb91b6..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,7 +7,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 045afb39e71..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml index 96f06388ed3..91c886e41b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -34,7 +35,8 @@ perConnectionBufferLimitBytes: 1500 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: 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 b7a2badfead..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml index 885e958a3e6..76e8d8b7cf5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8081 defaultFilterChain: filters: @@ -33,7 +34,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8082 defaultFilterChain: filters: @@ -71,7 +73,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8083 defaultFilterChain: filters: 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 820f85f625b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml index 03fe43687b2..0becefcb07b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -36,7 +37,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml index 03c1932b68e..d4b97c1941b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 0e10ab58f0c..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml index 0a50c1bb280..7a61b6197b2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 1c72d4f070f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml index 19c56586960..29be8f0b25c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 18846488a59..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -92,7 +92,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml index 0ccea8c2bcb..4f7cd0b8af7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 18846488a59..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -92,7 +92,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml index e2054562760..71ebe76cb1e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 ba70eb86e94..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -83,7 +83,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml index 84b95081c80..167e96f53e0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 3bac84394be..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -41,7 +41,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 15s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml index 55e2fde715b..fec7e1ade2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 ede262a5694..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -65,7 +65,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -90,7 +90,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -115,7 +115,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml index acf4c0a40f6..1f010cbb726 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 ff3aedce52a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml index 5053c959bfc..6c1a233f5b2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 820f85f625b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.listeners.yaml index 5041136d090..f9ce7d84e7c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8081 defaultFilterChain: filters: @@ -33,7 +34,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8082 defaultFilterChain: filters: 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 0a3d6ba340e..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml index f9b4ee27bf6..f89d388819d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8081 defaultFilterChain: filters: @@ -32,7 +33,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8082 defaultFilterChain: filters: @@ -63,7 +65,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8083 defaultFilterChain: filters: @@ -95,7 +98,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 8084 defaultFilterChain: filters: 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 09b9396270a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -43,7 +43,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -80,7 +80,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -114,7 +114,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -149,7 +149,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 35b68d18b32..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -32,7 +32,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml index 4a3daf7b5eb..93320e1347b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -40,7 +41,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 defaultFilterChain: filters: 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 f1b16b07b54..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml index cc61653cdf6..6c2ec38ab4f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml index 13b18487b29..858a6a99df5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 4f007ff7c47..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml index 09426a31773..cc24216073a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9b420408aaa..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml index 2d688753f05..cefa3f8fcfd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 3e4300de532..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 876e1084c87..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 0bd72d2b460..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 d76408ee96f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -94,7 +94,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -112,7 +112,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml index c3fb113017a..9c25f196445 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 7be6b0f7ade..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 565c93fd5ff..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 c8dc8147580..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 de1e5ced9a4..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 1e0be1f0405..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f3b7838ceee..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f3b7838ceee..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f3b7838ceee..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 3041d18c4eb..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 3041d18c4eb..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8290c2d1837..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 3041d18c4eb..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 3041d18c4eb..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8290c2d1837..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 de1e5ced9a4..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml index 3c8062f0a29..a857be906cd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 b7a2badfead..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 820f85f625b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 a9be418a101..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml index 657d2b42a82..725b879b355 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 820f85f625b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml index c3fb113017a..9c25f196445 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 fccf18807c5..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml index 657d2b42a82..725b879b355 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 51702c7c79b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -63,7 +63,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml index 5a43997887d..09c1f7373da 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -35,6 +36,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10081 defaultFilterChain: filters: 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 73cb7f276b2..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml index 657d2b42a82..725b879b355 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 ee7ebf5a19f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -32,7 +32,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml index 87cd9f2a9d7..7d466743074 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -40,7 +41,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 defaultFilterChain: filters: 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 7fb571dc42f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml index 7efdb2940f8..952475f29ec 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 de12099b7de..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml index 7935c97f7f4..39cef2f193b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 0a2796cd6ac..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -31,7 +31,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -56,7 +56,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -84,7 +84,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml index fc499431884..ba98a10f789 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml index 25230ccd9b5..d150efd0384 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 1c72d4f070f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml index 49a651da85e..98b2a58f8ef 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10443 protocol: UDP drainType: MODIFY_ONLY @@ -56,6 +57,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10443 filterChains: - filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f9a046becf5..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml index fb7bceafa22..1825eb14ab6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 745719faa2b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml index fb7bceafa22..1825eb14ab6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 8f5d81ea045..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml index 9172af8519b..25c76bcef2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 308f92773e8..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -67,7 +67,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml index bbfa00a53ea..0ac893c74ea 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8555780dab4..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml index a48a09b2dd7..82dbfaae02c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.listeners.yaml @@ -13,7 +13,8 @@ path: /dev/stdout address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8f5d81ea045..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml index 51d778b9cea..393caa96eb5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 a5f1527ade9..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -85,7 +85,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml index ead8b20d402..15f08c52173 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8f5d81ea045..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml index c839763d975..1eb896e1a7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 820f85f625b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -34,3 +34,39 @@ outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tls-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tls-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcp-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tcp-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.endpoints.yaml index de95bf555b9..5b4fe89e58c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.endpoints.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.endpoints.yaml @@ -22,3 +22,27 @@ loadBalancingWeight: 1 locality: region: second-route-dest/backend/0 +- clusterName: tls-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tls-route-dest/backend/0 +- clusterName: tcp-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcp-route-dest/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml index 49a4bf7dc21..7286927497c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -34,7 +35,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 defaultFilterChain: filters: @@ -73,13 +75,47 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10082 + filterChains: + - filterChainMatch: + serverNames: + - bar.com + filters: + - name: envoy.filters.network.connection_limit + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit + maxConnections: "3" + statPrefix: tls-passthrough-10082 + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tls-route-dest + statPrefix: tls-passthrough-10082 + listenerFilters: + - name: envoy.filters.listener.tls_inspector + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector name: third-listener perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10083 + filterChains: + - filters: + - name: envoy.filters.network.connection_limit + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit + delay: 3s + maxConnections: "10" + statPrefix: tcp-10083 + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcp-route-dest + statPrefix: tcp-10083 name: fourth-listener perConnectionBufferLimitBytes: 32768 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 c21b71ce6c5..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml index 210069d7019..016786b37f5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filterChainMatch: @@ -63,7 +64,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: 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 820f85f625b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -34,3 +34,39 @@ outlierDetection: {} perConnectionBufferLimitBytes: 32768 type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tls-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tls-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcp-route-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tcp-route-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.endpoints.yaml index de95bf555b9..5b4fe89e58c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.endpoints.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.endpoints.yaml @@ -22,3 +22,27 @@ loadBalancingWeight: 1 locality: region: second-route-dest/backend/0 +- clusterName: tls-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tls-route-dest/backend/0 +- clusterName: tcp-route-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcp-route-dest/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml index 11f91b65a34..8b7b4013e4f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: @@ -39,7 +40,8 @@ name: "9" - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 defaultFilterChain: filters: @@ -90,8 +92,23 @@ name: "5" - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10082 + filterChains: + - filterChainMatch: + serverNames: + - bar.com + filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tls-route-dest + statPrefix: tls-passthrough-10082 + listenerFilters: + - name: envoy.filters.listener.tls_inspector + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector name: third-listener perConnectionBufferLimitBytes: 32768 socketOptions: @@ -101,8 +118,16 @@ name: "9" - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10083 + filterChains: + - filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcp-route-dest + statPrefix: tcp-10083 name: fourth-listener perConnectionBufferLimitBytes: 32768 socketOptions: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.clusters.yaml new file mode 100644 index 00000000000..0764d46f0ed --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.clusters.yaml @@ -0,0 +1,2 @@ +- name: EmptyCluster + type: STATIC diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.endpoints.yaml new file mode 100644 index 00000000000..fe51488c706 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.endpoints.yaml @@ -0,0 +1 @@ +[] diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml new file mode 100644 index 00000000000..93a9663d159 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.listeners.yaml @@ -0,0 +1,43 @@ +- address: + socketAddress: + address: 0.0.0.0 + ipv4Compat: true + portValue: 10443 + filterChains: + - filters: + - name: envoy.filters.network.connection_limit + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit + delay: 10s + maxConnections: "3" + statPrefix: tcp-10443 + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: EmptyCluster + idleTimeout: 1200s + statPrefix: tcp-10443 + name: EmptyCluster + listenerFilters: + - name: envoy.filters.listener.proxy_protocol + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol + name: envoy-gateway/gateway-1/tls-1 + perConnectionBufferLimitBytes: 50000000 + socketOptions: + - description: socket option to enable tcp keep alive + intValue: "1" + level: "1" + name: "9" + - description: socket option for keep alive probes + intValue: "3" + level: "6" + name: "6" + - description: socket option for keep alive idle time + intValue: "1200" + level: "6" + name: "4" + - description: socket option for keep alive interval + intValue: "60" + level: "6" + name: "5" diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.routes.yaml new file mode 100644 index 00000000000..fe51488c706 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-without-route.routes.yaml @@ -0,0 +1 @@ +[] 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 0c2202ce28f..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,7 +21,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -39,7 +39,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -57,7 +57,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -75,7 +75,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -96,7 +96,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -116,7 +116,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -134,7 +134,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -154,7 +154,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -172,7 +172,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 b7a2badfead..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml index 1f27366aa32..d23d6e5323a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml index 1426aeaa71f..565ad98228f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 c3b0666ab24..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml index 39bfe9f587b..44ffd11e130 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 protocol: UDP defaultFilterChain: @@ -66,6 +67,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 bd6b6e1ae2e..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -94,7 +94,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml index 86002534182..bfed5797031 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 19e6869eb5e..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml index 2df07dabd56..cf89025ba17 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 ff3aedce52a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml index 7d177b2e092..8cc49659b0a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10001 filterChains: - filters: @@ -59,7 +60,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10002 filterChains: - filters: @@ -119,7 +121,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10003 filterChains: - filters: @@ -181,7 +184,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10004 filterChains: - filters: @@ -245,7 +249,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10005 filterChains: - filters: 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 ff3aedce52a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml index 33262561948..5404e9c4612 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10001 filterChains: - filters: @@ -59,7 +60,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10002 filterChains: - filters: @@ -119,7 +121,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10003 filterChains: - filters: @@ -179,7 +182,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10004 filterChains: - filters: @@ -239,7 +243,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10005 filterChains: - filters: 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 16f6727a1a1..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml index bae66f2ff21..ff623ed0918 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: @@ -59,7 +60,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: 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 16f6727a1a1..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml index cdb0e351dec..5322382f349 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: @@ -59,7 +60,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: 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 e467e24db53..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml index 3addb294484..995d70e1811 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f196a3fdd9a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml index 37178ddfe5f..f02d5214210 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml index c8eda3875ed..11e2a389c0d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 47b4007397e..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 182245f1986..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml index a80f448f017..2f68d5d848d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 d2577b68f8b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml index 973d90913b4..821bf6ee840 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 4e607e59dbb..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -24,7 +24,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -44,7 +44,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -64,7 +64,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml index a80f448f017..2f68d5d848d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 d2577b68f8b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml index a80f448f017..2f68d5d848d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8aff78e3195..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml index a80f448f017..2f68d5d848d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 8aff78e3195..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -40,7 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -58,7 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -76,7 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml index a80f448f017..2f68d5d848d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 new file mode 100644 index 00000000000..91bbe4fa396 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml @@ -0,0 +1,54 @@ +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: httproute/default/httproute-1/rule/0 + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: httproute/default/httproute-1/rule/0 + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + type: EDS +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + dnsRefreshRate: 30s + lbPolicy: LEAST_REQUEST + loadAssignment: + clusterName: oidc_example_com_443 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: oidc.example.com + portValue: 443 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: oidc_example_com_443/backend/0 + name: oidc_example_com_443 + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + respectDnsTtl: true + transportSocket: + name: envoy.transport_sockets.tls + typedConfig: + '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext + commonTlsContext: + validationContext: + trustedCa: + filename: /etc/ssl/certs/ca-certificates.crt + sni: oidc.example.com + type: STRICT_DNS diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.endpoints.yaml new file mode 100644 index 00000000000..29bb6b4e444 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.endpoints.yaml @@ -0,0 +1,12 @@ +- clusterName: httproute/default/httproute-1/rule/0 + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 7.7.7.7 + portValue: 8080 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: httproute/default/httproute-1/rule/0/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml new file mode 100644 index 00000000000..d8e6bbf9091 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.listeners.yaml @@ -0,0 +1,108 @@ +- address: + socketAddress: + address: 0.0.0.0 + ipv4Compat: true + portValue: 10080 + defaultFilterChain: + filters: + - name: envoy.filters.network.http_connection_manager + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + commonHttpProtocolOptions: + headersWithUnderscoresAction: REJECT_REQUEST + http2ProtocolOptions: + initialConnectionWindowSize: 1048576 + initialStreamWindowSize: 65536 + maxConcurrentStreams: 100 + httpFilters: + - disabled: true + name: envoy.filters.http.oauth2/securitypolicy/default/policy-for-http-route + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.oauth2.v3.OAuth2 + config: + authScopes: + - openid + - email + - profile + authType: BASIC_AUTH + authorizationEndpoint: https://oidc.example.com/authorize + credentials: + clientId: prometheus + cookieNames: + bearerToken: AccessToken-5f93c2e4 + idToken: IdToken + oauthExpires: OauthExpires-5f93c2e4 + oauthHmac: OauthHMAC-5f93c2e4 + oauthNonce: OauthNonce-5f93c2e4 + refreshToken: RefreshToken-5f93c2e4 + hmacSecret: + name: oauth2/hmac_secret/securitypolicy/default/policy-for-http-route + sdsConfig: + ads: {} + resourceApiVersion: V3 + tokenSecret: + name: oauth2/client_secret/securitypolicy/default/policy-for-http-route + sdsConfig: + ads: {} + resourceApiVersion: V3 + preserveAuthorizationHeader: true + redirectPathMatcher: + path: + exact: /oauth2/callback + redirectUri: '%REQ(x-forwarded-proto)%://%REQ(:authority)%/oauth2/callback' + signoutPath: + path: + exact: /logout + tokenEndpoint: + cluster: oidc_example_com_443 + timeout: 10s + uri: https://oidc.example.com/oauth/token + useRefreshToken: false + - name: envoy.filters.http.jwt_authn + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication + providers: + httproute/default/httproute-1/rule/0/match/0/www_example_com/exjwt: + claimToHeaders: + - claimName: email + headerName: x-user-email + forward: true + fromCookies: + - IdToken + issuer: https://oidc.example.com/auth/realms/example + normalizePayloadInMetadata: + spaceDelimitedClaims: + - scope + payloadInMetadata: exjwt + remoteJwks: + asyncFetch: {} + cacheDuration: 300s + httpUri: + cluster: oidc_example_com_443 + timeout: 10s + uri: https://oidc.example.com/auth/realms/example/protocol/openid-connect/certs + retryPolicy: {} + requirementMap: + httproute/default/httproute-1/rule/0/match/0/www_example_com: + providerName: httproute/default/httproute-1/rule/0/match/0/www_example_com/exjwt + - name: envoy.filters.http.rbac + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC + - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + suppressEnvoyHeaders: true + mergeSlashes: true + normalizePath: true + pathWithEscapedSlashesAction: UNESCAPE_AND_REDIRECT + rds: + configSource: + ads: {} + resourceApiVersion: V3 + routeConfigName: envoy-gateway/gateway-1/http + serverHeaderTransformation: PASS_THROUGH + statPrefix: http-10080 + useRemoteAddress: true + name: envoy-gateway/gateway-1/http + name: envoy-gateway/gateway-1/http + perConnectionBufferLimitBytes: 32768 diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.routes.yaml new file mode 100644 index 00000000000..9c66aad8e61 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.routes.yaml @@ -0,0 +1,74 @@ +- ignorePortInHostMatching: true + name: envoy-gateway/gateway-1/http + virtualHosts: + - domains: + - www.example.com + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: Gateway + name: gateway-1 + namespace: envoy-gateway + sectionName: http + name: envoy-gateway/gateway-1/http/www_example_com + routes: + - match: + pathSeparatedPrefix: /foo + metadata: + filterMetadata: + envoy-gateway: + resources: + - kind: HTTPRoute + name: httproute-1 + namespace: default + name: httproute/default/httproute-1/rule/0/match/0/www_example_com + route: + cluster: httproute/default/httproute-1/rule/0 + upgradeConfigs: + - upgradeType: websocket + typedPerFilterConfig: + envoy.filters.http.jwt_authn: + '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig + requirementName: httproute/default/httproute-1/rule/0/match/0/www_example_com + envoy.filters.http.oauth2/securitypolicy/default/policy-for-http-route: + '@type': type.googleapis.com/envoy.config.route.v3.FilterConfig + config: {} + envoy.filters.http.rbac: + '@type': type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBACPerRoute + rbac: + matcher: + matcherList: + matchers: + - onMatch: + action: + name: allow + typedConfig: + '@type': type.googleapis.com/envoy.config.rbac.v3.Action + name: ALLOW + predicate: + singlePredicate: + customMatch: + name: claim_matcher + typedConfig: + '@type': type.googleapis.com/envoy.extensions.matching.input_matchers.metadata.v3.Metadata + value: + listMatch: + oneOf: + stringMatch: + exact: foobar + input: + name: claim + typedConfig: + '@type': type.googleapis.com/envoy.extensions.matching.common_inputs.network.v3.DynamicMetadataInput + filter: envoy.filters.http.jwt_authn + path: + - key: exjwt + - key: groups + onNoMatch: + action: + name: default + typedConfig: + '@type': type.googleapis.com/envoy.config.rbac.v3.Action + action: DENY + name: DENY diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.secrets.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.secrets.yaml new file mode 100644 index 00000000000..b60c4fc7500 --- /dev/null +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.secrets.yaml @@ -0,0 +1,8 @@ +- genericSecret: + secret: + inlineBytes: qrOYACHXoe7UEDI/raOjNSx+Z9ufXSc/22C3T6X/zPY= + name: oauth2/client_secret/securitypolicy/default/policy-for-http-route +- genericSecret: + secret: + inlineBytes: qrOYACHXoe7UEDI/raOjNSx+Z9ufXSc/22C3T6X/zPY= + name: oauth2/hmac_secret/securitypolicy/default/policy-for-http-route 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml index 3d65ed1a895..9f852cd8701 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 9ada55d6523..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml index 4c624b8788f..2488a8f083c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filterChainMatch: 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 fe51488c706..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 @@ -1 +1,20 @@ -[] +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcp-route-simple-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tcp-route-simple-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + trackClusterStats: + perEndpointStats: true + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.endpoints.yaml index fe51488c706..7eb06a08f40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.endpoints.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.endpoints.yaml @@ -1 +1,18 @@ -[] +- clusterName: tcp-route-simple-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + - endpoint: + address: + socketAddress: + address: 5.6.7.8 + portValue: 50001 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcp-route-simple-dest/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml index 2e300bdfaad..12011f9ae49 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.listeners.yaml @@ -1,6 +1,14 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 + filterChains: + - filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcp-route-simple-dest + statPrefix: tcp-10080 name: tcp-route-enable-endpoint-stats perConnectionBufferLimitBytes: 32768 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 1daefb357c5..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml index 0615ffcff8a..33d35dcfdbc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.listeners.yaml @@ -1,11 +1,7 @@ -- additionalAddresses: - - address: - socketAddress: - address: '::' - portValue: 8082 - address: +- address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 8082 filterChains: - filters: 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 fe51488c706..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 @@ -1 +1,20 @@ -[] +- circuitBreakers: + thresholds: + - maxRetries: 1024 + commonLbConfig: + localityWeightedLbConfig: {} + connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED + edsClusterConfig: + edsConfig: + ads: {} + resourceApiVersion: V3 + serviceName: tcp-route-simple-dest + ignoreHealthOnHostRemoval: true + lbPolicy: LEAST_REQUEST + name: tcp-route-simple-dest + outlierDetection: {} + perConnectionBufferLimitBytes: 32768 + trackClusterStats: + requestResponseSizes: true + type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.endpoints.yaml index fe51488c706..7eb06a08f40 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.endpoints.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.endpoints.yaml @@ -1 +1,18 @@ -[] +- clusterName: tcp-route-simple-dest + endpoints: + - lbEndpoints: + - endpoint: + address: + socketAddress: + address: 1.2.3.4 + portValue: 50000 + loadBalancingWeight: 1 + - endpoint: + address: + socketAddress: + address: 5.6.7.8 + portValue: 50001 + loadBalancingWeight: 1 + loadBalancingWeight: 1 + locality: + region: tcp-route-simple-dest/backend/0 diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml index 994341e55ec..c70b6728097 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.listeners.yaml @@ -1,6 +1,14 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 + filterChains: + - filters: + - name: envoy.filters.network.tcp_proxy + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + cluster: tcp-route-simple-dest + statPrefix: tcp-10080 name: tcp-route-enable-req-resp-sizes-stats perConnectionBufferLimitBytes: 32768 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 c6291c77dd5..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml index 336e84c9eab..5023b077b09 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filterChainMatch: 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 aa8f0b0902b..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml index 4dc8055463a..72f40213b1b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 dbd196ef664..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml index b3f30d194ed..4423eb58f5b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filters: 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 2219185b250..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml index 7c84083a0ba..4ec20d0cc11 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filterChainMatch: 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 4c2749a767a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 31s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 c2659deb6c9..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml index d5d32d6ee55..dab6fe543f3 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filterChainMatch: @@ -21,7 +22,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filterChainMatch: 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 16f6727a1a1..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml index 7eee7e167c0..64028f1420d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 filterChains: - filterChainMatch: @@ -79,7 +80,8 @@ perConnectionBufferLimitBytes: 32768 - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10081 filterChains: - filters: 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 7597e1328d9..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml index 07a3d581575..7f41a9bed98 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 7ea8aa936c4..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -24,7 +24,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml index a98dfd0d9d4..e19a79d30dc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 f1a975a6e6a..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml index 6efe38a6b12..e5532223241 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 975086f5fff..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -23,7 +23,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 15s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml index 599eb3b58af..5832f199bc9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 dd47af97cdd..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml index 8d9eaea1141..09c7681d79e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 protocol: UDP listenerFilters: 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 7ce45648946..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml index 6bf13465916..cc92fbd6ed6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 protocol: UDP listenerFilters: 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 e153c882fd6..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml index 317a7ddc4dd..71f29a0035a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 protocol: UDP listenerFilters: 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 eca236db657..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml index c3fb113017a..a9b9065d238 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: - address: 0.0.0.0 + address: '::' + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: 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 408fc9c218e..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,7 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,7 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s - dnsLookupFamily: V4_ONLY + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml index a4545e62e2c..236ae0ec8a1 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.listeners.yaml @@ -1,6 +1,7 @@ - address: socketAddress: address: 0.0.0.0 + ipv4Compat: true portValue: 10080 defaultFilterChain: filters: diff --git a/internal/xds/translator/tracing.go b/internal/xds/translator/tracing.go index 3e817bad1bf..ee3f4f5e907 100644 --- a/internal/xds/translator/tracing.go +++ b/internal/xds/translator/tracing.go @@ -6,7 +6,6 @@ package translator import ( - "errors" "fmt" "sort" @@ -176,7 +175,7 @@ func processClusterForTracing(tCtx *types.ResourceVersionTable, tracing *ir.Trac if traffic == nil { traffic = &ir.TrafficFeatures{} } - if err := addXdsCluster(tCtx, &xdsClusterArgs{ + return addXdsCluster(tCtx, &xdsClusterArgs{ name: tracing.Destination.Name, settings: tracing.Destination.Settings, tSocket: nil, @@ -191,8 +190,5 @@ func processClusterForTracing(tCtx *types.ResourceVersionTable, tracing *ir.Trac backendConnection: traffic.BackendConnection, dns: traffic.DNS, http2Settings: traffic.HTTP2, - }); err != nil && !errors.Is(err, ErrXdsClusterExists) { - return err - } - return nil + }) } diff --git a/internal/xds/translator/translator.go b/internal/xds/translator/translator.go index 27c0d3c5a04..a76382dd569 100644 --- a/internal/xds/translator/translator.go +++ b/internal/xds/translator/translator.go @@ -34,13 +34,12 @@ import ( "github.com/envoyproxy/gateway/internal/xds/types" ) -var ( - ErrXdsClusterExists = errors.New("xds cluster exists") - ErrXdsSecretExists = errors.New("xds secret exists") +const ( + AuthorityHeaderKey = ":authority" + // The dummy cluster for TCP listeners that have no routes + emptyClusterName = "EmptyCluster" ) -const AuthorityHeaderKey = ":authority" - // Translator translates the xDS IR into xDS resources. type Translator struct { // GlobalRateLimit holds the global rate limit settings @@ -230,7 +229,7 @@ func (t *Translator) processHTTPListenerXdsTranslation( // Create a new TCP listener for HTTP1/HTTP2 traffic. if tcpXDSListener, err = buildXdsTCPListener( - httpListener.Name, httpListener.Address, httpListener.Port, httpListener.IPFamily, + httpListener.Name, httpListener.Address, httpListener.Port, httpListener.TCPKeepalive, httpListener.Connection, accessLog); err != nil { errs = errors.Join(errs, err) continue @@ -487,7 +486,7 @@ func (t *Translator) addRouteToRouteConfig( tSocket: nil, endpointType: EndpointTypeStatic, metrics: metrics, - }); err != nil && !errors.Is(err, ErrXdsClusterExists) { + }); err != nil { errs = errors.Join(errs, err) } } @@ -576,7 +575,7 @@ func (t *Translator) processTCPListenerXdsTranslation( xdsListener := findXdsListenerByHostPort(tCtx, tcpListener.Address, tcpListener.Port, corev3.SocketAddress_TCP) if xdsListener == nil { if xdsListener, err = buildXdsTCPListener( - tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.IPFamily, + tcpListener.Name, tcpListener.Address, tcpListener.Port, tcpListener.TCPKeepalive, tcpListener.Connection, accesslog); err != nil { // skip this listener if failed to build xds listener errs = errors.Join(errs, err) @@ -598,7 +597,7 @@ func (t *Translator) processTCPListenerXdsTranslation( patchProxyProtocolFilter(xdsListener, tcpListener.EnableProxyProtocol) for _, route := range tcpListener.Routes { - if err := processXdsCluster(tCtx, &TCPRouteTranslator{route}, &ExtraArgs{metrics: metrics}); err != nil && !errors.Is(err, ErrXdsClusterExists) { + if err := processXdsCluster(tCtx, &TCPRouteTranslator{route}, &ExtraArgs{metrics: metrics}); err != nil { errs = errors.Join(errs, err) } if route.TLS != nil && route.TLS.Terminate != nil { @@ -627,6 +626,31 @@ func (t *Translator) processTCPListenerXdsTranslation( errs = errors.Join(errs, err) } } + + // If there are no routes, add a route without a destination to the listener to create a filter chain + // This is needed because Envoy requires a filter chain to be present in the listener, otherwise it will reject the listener and report a warning + if len(tcpListener.Routes) == 0 { + emptyRouteCluster := &clusterv3.Cluster{ + Name: emptyClusterName, + ClusterDiscoveryType: &clusterv3.Cluster_Type{Type: clusterv3.Cluster_STATIC}, + } + + if findXdsCluster(tCtx, emptyClusterName) == nil { + if err := tCtx.AddXdsResource(resourcev3.ClusterType, emptyRouteCluster); err != nil { + errs = errors.Join(errs, err) + } + } + + emptyRoute := &ir.TCPRoute{ + Name: emptyClusterName, + Destination: &ir.RouteDestination{ + Name: emptyClusterName, + }, + } + if err := addXdsTCPFilterChain(xdsListener, emptyRoute, emptyClusterName, accesslog, tcpListener.Timeout, tcpListener.Connection); err != nil { + errs = errors.Join(errs, err) + } + } } return errs } @@ -660,7 +684,7 @@ func processUDPListenerXdsTranslation( } // 1:1 between IR UDPRoute and xDS Cluster - if err := processXdsCluster(tCtx, &UDPRouteTranslator{route}, &ExtraArgs{metrics: metrics}); err != nil && !errors.Is(err, ErrXdsClusterExists) { + if err := processXdsCluster(tCtx, &UDPRouteTranslator{route}, &ExtraArgs{metrics: metrics}); err != nil { errs = errors.Join(errs, err) } } @@ -754,10 +778,7 @@ func findXdsEndpoint(tCtx *types.ResourceVersionTable, name string) *endpointv3. // processXdsCluster processes xds cluster with args per route. func processXdsCluster(tCtx *types.ResourceVersionTable, route clusterArgs, extras *ExtraArgs) error { - if err := addXdsCluster(tCtx, route.asClusterArgs(extras)); err != nil && !errors.Is(err, ErrXdsClusterExists) { - return err - } - return nil + return addXdsCluster(tCtx, route.asClusterArgs(extras)) } // findXdsSecret finds a xds secret with the same name, and returns nil if there is no match. @@ -776,10 +797,12 @@ func findXdsSecret(tCtx *types.ResourceVersionTable, name string) *tlsv3.Secret return nil } +// addXdsSecret adds a xds secret with args. +// If the secret already exists, it skips adding the secret and returns nil func addXdsSecret(tCtx *types.ResourceVersionTable, secret *tlsv3.Secret) error { - // Return early if cluster with the same name exists + // Return early if secret with the same name exists if c := findXdsSecret(tCtx, secret.Name); c != nil { - return ErrXdsSecretExists + return nil } if err := tCtx.AddXdsResource(resourcev3.SecretType, secret); err != nil { @@ -788,10 +811,15 @@ func addXdsSecret(tCtx *types.ResourceVersionTable, secret *tlsv3.Secret) error return nil } +// addXdsCluster adds a xds cluster with args. +// If the cluster already exists, it skips adding the cluster and returns nil. func addXdsCluster(tCtx *types.ResourceVersionTable, args *xdsClusterArgs) error { - // Return early if cluster with the same name exists + // Return early if cluster with the same name exists. + // All the current callers can all safely assume the xdsClusterArgs is the same for the clusters with the same name. + // If this assumption changes, the callers should call findXdsCluster first to check if the cluster already exists + // before calling addXdsCluster. if c := findXdsCluster(tCtx, args.name); c != nil { - return ErrXdsClusterExists + return nil } xdsCluster := buildXdsCluster(args) diff --git a/internal/xds/translator/utils.go b/internal/xds/translator/utils.go index 23d455edd9c..882d9b1e926 100644 --- a/internal/xds/translator/utils.go +++ b/internal/xds/translator/utils.go @@ -133,7 +133,6 @@ func createExtServiceXDSCluster(rd *ir.RouteDestination, traffic *ir.TrafficFeat var ( endpointType EndpointType tSocket *corev3.TransportSocket - err error ) // Make sure that there are safe defaults for the traffic @@ -148,7 +147,7 @@ func createExtServiceXDSCluster(rd *ir.RouteDestination, traffic *ir.TrafficFeat } else { endpointType = EndpointTypeStatic } - if err = addXdsCluster(tCtx, &xdsClusterArgs{ + return addXdsCluster(tCtx, &xdsClusterArgs{ name: rd.Name, settings: rd.Settings, tSocket: tSocket, @@ -162,10 +161,7 @@ func createExtServiceXDSCluster(rd *ir.RouteDestination, traffic *ir.TrafficFeat endpointType: endpointType, dns: traffic.DNS, http2Settings: traffic.HTTP2, - }); err != nil && !errors.Is(err, ErrXdsClusterExists) { - return err - } - return nil + }) } // addClusterFromURL adds a cluster to the resource version table from the provided URL. @@ -198,8 +194,5 @@ func addClusterFromURL(url string, tCtx *types.ResourceVersionTable) error { clusterArgs.tSocket = tSocket } - if err = addXdsCluster(tCtx, clusterArgs); err != nil && !errors.Is(err, ErrXdsClusterExists) { - return err - } - return nil + return addXdsCluster(tCtx, clusterArgs) } diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 2a028241148..30f3ad5eed8 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -2,7 +2,8 @@ date: Pending # Changes that are expected to cause an incompatibility with previous versions, such as deletions or modifications to existing APIs. breaking changes: | - Add a breaking change here + 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: | @@ -20,6 +21,10 @@ bug fixes: | Route with multiple parents has incorrect namespace in parentRef status BackendTlsPolicy specify multiple targetRefs of the same service, only one will work Helm chart fails for Flux HelmRelease + Fixed Envoy rejecting TCP Listeners that have no attached TCPRoutes + Fixed failed to update SecurityPolicy resources with the `backendRef` field specified + 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/test/cel-validation/securitypolicy_test.go b/test/cel-validation/securitypolicy_test.go index f00ee84260c..033726f2b56 100644 --- a/test/cel-validation/securitypolicy_test.go +++ b/test/cel-validation/securitypolicy_test.go @@ -566,6 +566,26 @@ func TestSecurityPolicyTarget(t *testing.T) { }, wantErrors: []string{}, }, + { + desc: "empty HTTP external auth service", + mutate: func(sp *egv1a1.SecurityPolicy) { + sp.Spec = egv1a1.SecurityPolicySpec{ + ExtAuth: &egv1a1.ExtAuth{ + HTTP: &egv1a1.HTTPExtAuthService{}, + }, + PolicyTargetReferences: egv1a1.PolicyTargetReferences{ + TargetRef: &gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{ + LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{ + Group: "gateway.networking.k8s.io", + Kind: "Gateway", + Name: "eg", + }, + }, + }, + } + }, + wantErrors: []string{" backendRef or backendRefs needs to be set"}, + }, { desc: "no extAuth", mutate: func(sp *egv1a1.SecurityPolicy) { @@ -657,36 +677,6 @@ func TestSecurityPolicyTarget(t *testing.T) { " BackendRefs only supports Core and gateway.envoyproxy.io group.", }, }, - { - desc: "http extAuth service invalid Kind", - mutate: func(sp *egv1a1.SecurityPolicy) { - sp.Spec = egv1a1.SecurityPolicySpec{ - ExtAuth: &egv1a1.ExtAuth{ - HTTP: &egv1a1.HTTPExtAuthService{ - BackendCluster: egv1a1.BackendCluster{ - BackendRef: &gwapiv1.BackendObjectReference{ - Kind: ptr.To(gwapiv1.Kind("unsupported")), - Name: "http-auth-service", - Port: ptr.To(gwapiv1.PortNumber(15001)), - }, - }, - }, - }, - PolicyTargetReferences: egv1a1.PolicyTargetReferences{ - TargetRef: &gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{ - LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{ - Group: "gateway.networking.k8s.io", - Kind: "Gateway", - Name: "eg", - }, - }, - }, - } - }, - wantErrors: []string{ - "BackendRefs must be used, backendRef is not supported.", - }, - }, { desc: "http extAuth service backendRefs invalid Kind", mutate: func(sp *egv1a1.SecurityPolicy) { @@ -753,36 +743,6 @@ func TestSecurityPolicyTarget(t *testing.T) { "BackendRefs only supports Core and gateway.envoyproxy.io group.", }, }, - { - desc: "grpc extAuth service invalid Kind", - mutate: func(sp *egv1a1.SecurityPolicy) { - sp.Spec = egv1a1.SecurityPolicySpec{ - ExtAuth: &egv1a1.ExtAuth{ - GRPC: &egv1a1.GRPCExtAuthService{ - BackendCluster: egv1a1.BackendCluster{ - BackendRef: &gwapiv1.BackendObjectReference{ - Kind: ptr.To(gwapiv1.Kind("unsupported")), - Name: "http-auth-service", - Port: ptr.To(gwapiv1.PortNumber(15001)), - }, - }, - }, - }, - PolicyTargetReferences: egv1a1.PolicyTargetReferences{ - TargetRef: &gwapiv1a2.LocalPolicyTargetReferenceWithSectionName{ - LocalPolicyTargetReference: gwapiv1a2.LocalPolicyTargetReference{ - Group: "gateway.networking.k8s.io", - Kind: "Gateway", - Name: "eg", - }, - }, - }, - } - }, - wantErrors: []string{ - "BackendRefs must be used, backendRef is not supported.", - }, - }, { desc: "grpc extAuth service backendRefs invalid Kind", mutate: func(sp *egv1a1.SecurityPolicy) { diff --git a/test/e2e/testdata/ext-auth-http-securitypolicy.yaml b/test/e2e/testdata/ext-auth-http-securitypolicy.yaml index c6a1e73c6a6..f79bbaf8745 100644 --- a/test/e2e/testdata/ext-auth-http-securitypolicy.yaml +++ b/test/e2e/testdata/ext-auth-http-securitypolicy.yaml @@ -47,8 +47,8 @@ spec: name: http-with-ext-auth extAuth: http: - backendRefs: - - name: http-ext-auth + backendRef: + name: http-ext-auth namespace: gateway-conformance-infra port: 9002 headersToBackend: ["x-current-user"] diff --git a/test/e2e/tests/envoy_shutdown.go b/test/e2e/tests/envoy_shutdown.go index 24e6b334637..ccbacb4a309 100644 --- a/test/e2e/tests/envoy_shutdown.go +++ b/test/e2e/tests/envoy_shutdown.go @@ -51,6 +51,9 @@ var EnvoyShutdownTest = suite.ConformanceTest{ t.Errorf("Failed to get proxy deployment") } + // Wait for the grpc ext auth service pod to be ready + WaitForPods(t, suite.Client, "envoy-gateway-system", map[string]string{"gateway.envoyproxy.io/owning-gateway-name": name}, corev1.PodRunning, PodReady) + // wait for route to be programmed on envoy expectedResponse := http.ExpectedResponse{ Request: http.Request{ @@ -79,7 +82,7 @@ var EnvoyShutdownTest = suite.ConformanceTest{ aborter.Abort(false) // abort the load either way if err != nil { - t.Errorf("Failed to rollout proxy deployment") + t.Errorf("Failed to rollout proxy deployment: %v", err) } // Wait for the goroutine to finish diff --git a/test/e2e/upgrade/eg_upgrade_test.go b/test/e2e/upgrade/eg_upgrade_test.go index b93a3bab0df..8c59ef158cb 100644 --- a/test/e2e/upgrade/eg_upgrade_test.go +++ b/test/e2e/upgrade/eg_upgrade_test.go @@ -10,9 +10,12 @@ package upgrade import ( "flag" "io/fs" + "os" "testing" "k8s.io/apimachinery/pkg/util/sets" + "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/gateway-api/conformance/utils/flags" "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/conformance/utils/tlog" @@ -25,6 +28,7 @@ import ( func TestEGUpgrade(t *testing.T) { flag.Parse() + log.SetLogger(zap.New(zap.WriteTo(os.Stderr), zap.UseDevMode(true))) c, cfg := kubetest.NewClient(t)