From bdb3af918c2713e70985f5499e8b89f15b959bf9 Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 15 Jun 2021 14:18:25 -0600 Subject: [PATCH] Regen golden files --- ...stom-and-tagged-addresses.envoy-1-18-x.golden | 16 ++++++++-------- ...tagged-addresses.v2compat.envoy-1-16-x.golden | 16 ++++++++-------- ...ating-gateway-no-api-cert.envoy-1-18-x.golden | 6 +++--- ...eway-no-api-cert.v2compat.envoy-1-16-x.golden | 6 +++--- ...g-gateway-service-subsets.envoy-1-18-x.golden | 12 ++++++------ ...-service-subsets.v2compat.envoy-1-16-x.golden | 12 ++++++------ .../terminating-gateway.envoy-1-18-x.golden | 8 ++++---- ...minating-gateway.v2compat.envoy-1-16-x.golden | 8 ++++---- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden index dff56531b..31db7b51b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -281,7 +281,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -335,7 +335,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -389,7 +389,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -443,7 +443,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden index f6d1a1ab2..356828093 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -281,7 +281,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -335,7 +335,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -389,7 +389,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -443,7 +443,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden index 856256340..a069ee434 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden index 522dbf701..59821616f 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden index 0116baa90..2515ef21e 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -184,7 +184,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -255,7 +255,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -326,7 +326,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden index 9f537846c..89b07f226 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -184,7 +184,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -255,7 +255,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -326,7 +326,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden index 6acb1c46d..4351d8f21 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden index 39e30e8c9..ac33bab98 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } }