luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Add explicit protocol overrides in tgw xds test cases

This commit is contained in:
freddygv 2020-09-03 08:57:48 -06:00
parent 0ac632c465
commit 0c50b8e769
41 changed files with 1497 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/proxycfg/testing.go
View File

@ -1883,7 +1883,7 @@ func testConfigSnapshotTerminatingGateway(t testing.T, populateServices bool) *C
snap.TerminatingGateway.ServiceConfigs = map[structs.ServiceName]*structs.ServiceConfigResponse{ snap.TerminatingGateway.ServiceConfigs = map[structs.ServiceName]*structs.ServiceConfigResponse{
web: { web: {
ProxyConfig: map[string]interface{}{"protocol": "http"}, ProxyConfig: map[string]interface{}{"protocol": "tcp"},
}, },
api: { api: {
ProxyConfig: map[string]interface{}{"protocol": "tcp"}, ProxyConfig: map[string]interface{}{"protocol": "tcp"},

8
agent/xds/clusters.go
View File

@ -208,13 +208,13 @@ func (s *Server) makeGatewayServiceClusters(cfgSnap *proxycfg.ConfigSnapshot) ([
var loadBalancer *structs.EnvoyLBConfig var loadBalancer *structs.EnvoyLBConfig
if hasResolver && resolver.LoadBalancer != nil { if !hasResolver {
loadBalancer = resolver.LoadBalancer.EnvoyConfig
} else {
// Use a zero value resolver with no timeout and no subsets // Use a zero value resolver with no timeout and no subsets
resolver = &structs.ServiceResolverConfigEntry{} resolver = &structs.ServiceResolverConfigEntry{}
} }
if resolver.LoadBalancer != nil {
loadBalancer = resolver.LoadBalancer.EnvoyConfig
}
// When making service clusters we only pass endpoints with hostnames if the kind is a terminating gateway // When making service clusters we only pass endpoints with hostnames if the kind is a terminating gateway
// This is because the services a mesh gateway will route to are not external services and are not addressed by a hostname. // This is because the services a mesh gateway will route to are not external services and are not addressed by a hostname.

18
agent/xds/clusters_test.go
View File

@ -527,6 +527,12 @@ func TestClustersFromSnapshot(t *testing.T) {
}, },
}, },
} }
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("web", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("cache", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
}, },
}, },
{ {
@ -553,6 +559,12 @@ func TestClustersFromSnapshot(t *testing.T) {
}, },
}, },
} }
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("api", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("cache", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
}, },
}, },
{ {
@ -589,6 +601,9 @@ func TestClustersFromSnapshot(t *testing.T) {
}, },
}, },
} }
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("web", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
}, },
}, },
{ {
@ -620,6 +635,9 @@ func TestClustersFromSnapshot(t *testing.T) {
}, },
}, },
} }
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("web", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
}, },
}, },
{ {

16
agent/xds/listeners_test.go
View File

@ -436,19 +436,9 @@ func TestListenersFromSnapshot(t *testing.T) {
}, },
}, },
}, },
structs.NewServiceName("web", nil): { }
Kind: structs.ServiceResolver, snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("web", nil)] = &structs.ServiceConfigResponse{
Name: "web", ProxyConfig: map[string]interface{}{"protocol": "http"},
Subsets: map[string]structs.ServiceResolverSubset{
"v1": {
Filter: "Service.Meta.version == 1",
},
"v2": {
Filter: "Service.Meta.version == 2",
OnlyPassing: true,
},
},
},
} }
}, },
}, },

3
agent/xds/routes_test.go
View File

@ -230,6 +230,9 @@ func TestRoutesFromSnapshot(t *testing.T) {
}, },
}, },
} }
snap.TerminatingGateway.ServiceConfigs[structs.NewServiceName("web", nil)] = &structs.ServiceConfigResponse{
ProxyConfig: map[string]interface{}{"protocol": "http"},
}
}, },
}, },
} }

32
agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-12-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-13-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-14-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-15-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-12-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-13-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-14-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

32
agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-15-x.golden vendored
View File

@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"outlierDetection": {
} }
} }
], ],

34
agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-12-x.golden vendored
View File

@ -12,7 +12,7 @@
} }
} }
}, },
"connectTimeout": "5s", "connectTimeout": "10s",
"outlierDetection": { "outlierDetection": {
} }
@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
} }
} }
], ],

34
agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-13-x.golden vendored
View File

@ -12,7 +12,7 @@
} }
} }
}, },
"connectTimeout": "5s", "connectTimeout": "10s",
"outlierDetection": { "outlierDetection": {
} }
@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
} }
} }
], ],

34
agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-14-x.golden vendored
View File

@ -12,7 +12,7 @@
} }
} }
}, },
"connectTimeout": "5s", "connectTimeout": "10s",
"outlierDetection": { "outlierDetection": {
} }
@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
} }
} }
], ],

34
agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-15-x.golden vendored
View File

@ -12,7 +12,7 @@
} }
} }
}, },
"connectTimeout": "5s", "connectTimeout": "10s",
"outlierDetection": { "outlierDetection": {
} }
@ -111,6 +111,38 @@
"connectTimeout": "5s", "connectTimeout": "5s",
"outlierDetection": { "outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "10s",
"outlierDetection": {
} }
} }
], ],

86
agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-12-x.golden vendored
View File

@ -1,6 +1,60 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "api.altdomain",
"portValue": 8081
}
}
},
"healthStatus": "HEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"tlsCertificates": [
{
"certificateChain": {
"filename": "api.cert.pem"
},
"privateKey": {
"filename": "api.key.pem"
}
}
],
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@ -119,6 +173,38 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

86
agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-13-x.golden vendored
View File

@ -1,6 +1,60 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "api.altdomain",
"portValue": 8081
}
}
},
"healthStatus": "HEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"tlsCertificates": [
{
"certificateChain": {
"filename": "api.cert.pem"
},
"privateKey": {
"filename": "api.key.pem"
}
}
],
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@ -119,6 +173,38 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

86
agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-14-x.golden vendored
View File

@ -1,6 +1,60 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "api.altdomain",
"portValue": 8081
}
}
},
"healthStatus": "HEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"tlsCertificates": [
{
"certificateChain": {
"filename": "api.cert.pem"
},
"privateKey": {
"filename": "api.key.pem"
}
}
],
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@ -119,6 +173,38 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

86
agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-15-x.golden vendored
View File

@ -1,6 +1,60 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "api.altdomain",
"portValue": 8081
}
}
},
"healthStatus": "HEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"tlsCertificates": [
{
"certificateChain": {
"filename": "api.cert.pem"
},
"privateKey": {
"filename": "api.key.pem"
}
}
],
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@ -119,6 +173,38 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

56
agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-12-x.golden vendored
View File

@ -119,6 +119,62 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

56
agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-13-x.golden vendored
View File

@ -119,6 +119,62 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

56
agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-14-x.golden vendored
View File

@ -119,6 +119,62 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

56
agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-15-x.golden vendored
View File

@ -119,6 +119,62 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

88
agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-12-x.golden vendored
View File

@ -119,6 +119,94 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

88
agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-13-x.golden vendored
View File

@ -119,6 +119,94 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

88
agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-14-x.golden vendored
View File

@ -119,6 +119,94 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

88
agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-15-x.golden vendored
View File

@ -119,6 +119,94 @@
} }
}, },
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "LOGICAL_DNS",
"connectTimeout": "5s",
"loadAssignment": {
"clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"endpoints": [
{
"lbEndpoints": [
{
"endpoint": {
"address": {
"socketAddress": {
"address": "cache.mydomain",
"portValue": 8081
}
}
},
"healthStatus": "UNHEALTHY",
"loadBalancingWeight": 1
}
]
}
]
},
"dnsRefreshRate": "10s",
"dnsLookupFamily": "V4_ONLY",
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{
"@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"type": "EDS",
"edsClusterConfig": {
"edsConfig": {
"ads": {
}
}
},
"connectTimeout": "5s",
"tlsContext": {
"commonTlsContext": {
"tlsParams": {
},
"validationContext": {
"trustedCa": {
"filename": "ca.cert.pem"
}
}
}
},
"outlierDetection": {
}
},
{ {
"@type": "type.googleapis.com/envoy.api.v2.Cluster", "@type": "type.googleapis.com/envoy.api.v2.Cluster",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",

70
agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-12-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "foo"
}, },
"stat_prefix": "terminating_gateway_default_web_foo_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_foo_tcp"
} }
} }
] ]
@ -417,33 +402,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "wan"
}, },
"stat_prefix": "terminating_gateway_default_web_wan_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_wan_tcp"
} }
} }
] ]

70
agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-13-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "foo"
}, },
"stat_prefix": "terminating_gateway_default_web_foo_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_foo_tcp"
} }
} }
] ]
@ -417,33 +402,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "wan"
}, },
"stat_prefix": "terminating_gateway_default_web_wan_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_wan_tcp"
} }
} }
] ]

70
agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-14-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "foo"
}, },
"stat_prefix": "terminating_gateway_default_web_foo_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_foo_tcp"
} }
} }
] ]
@ -417,33 +402,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "wan"
}, },
"stat_prefix": "terminating_gateway_default_web_wan_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_wan_tcp"
} }
} }
] ]

70
agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "foo"
}, },
"stat_prefix": "terminating_gateway_default_web_foo_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_foo_tcp"
} }
} }
] ]
@ -417,33 +402,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "wan"
}, },
"stat_prefix": "terminating_gateway_default_web_wan_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_wan_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-12-x.golden vendored
View File

@ -136,33 +136,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-13-x.golden vendored
View File

@ -136,33 +136,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-14-x.golden vendored
View File

@ -136,33 +136,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden vendored
View File

@ -136,33 +136,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway.envoy-1-12-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway.envoy-1-13-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway.envoy-1-14-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]

35
agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden vendored
View File

@ -183,33 +183,18 @@
}, },
"filters": [ "filters": [
{ {
"name": "envoy.http_connection_manager", "name": "envoy.filters.network.rbac",
"config": { "config": {
"http_filters": [ "rules": {
{
"config": {
"rules": {
}
},
"name": "envoy.filters.http.rbac"
},
{
"name": "envoy.router"
}
],
"rds": {
"config_source": {
"ads": {
}
},
"route_config_name": "default"
}, },
"stat_prefix": "terminating_gateway_default_web_default_http", "stat_prefix": "connect_authz"
"tracing": { }
"operation_name": "EGRESS", },
"random_sampling": { {
} "name": "envoy.tcp_proxy",
} "config": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "terminating_gateway_default_web_default_tcp"
} }
} }
] ]