diff --git a/changelogs/unreleased/6806-saley89-minor.md b/changelogs/unreleased/6806-saley89-minor.md new file mode 100644 index 00000000000..c3b118133c8 --- /dev/null +++ b/changelogs/unreleased/6806-saley89-minor.md @@ -0,0 +1,6 @@ +## Replace GRPC state of world updates with ADS Delta + +The mechanism used for xDS updates between Contour and Envoy has been changed from standard `GRPC` (aka "state of the world" updates) to +[Aggregated Discovery Service](https://www.envoyproxy.io/docs/envoy/latest/configuration/overview/xds_api#aggregated-discovery-service) (ADS) `Delta GRPC` updates. This change is a part of the ongoing effort to improve the performance and scalability of Contour. +With this mechanism in place Contour will now send only the changes to Envoy, instead of the entire state of the world on every update. Additionally, using ADS allows all the communication to be delivered on a single, bidirectional gRPC stream. +Together these changes drastically reduce the cpu and memory footprint of Contour and Envoy, and improve the overall performance of the system allowing for greater numbers of HttpProxies in a single cluster. diff --git a/internal/envoy/v3/auth.go b/internal/envoy/v3/auth.go index 0989c2409c8..a50ecc92dfd 100644 --- a/internal/envoy/v3/auth.go +++ b/internal/envoy/v3/auth.go @@ -31,7 +31,7 @@ func UpstreamTLSContext(peerValidationContext *dag.PeerValidationContext, sni st if clientSecret != nil { clientSecretConfigs = []*envoy_transport_socket_tls_v3.SdsSecretConfig{{ Name: envoy.Secretname(clientSecret), - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }} } @@ -125,7 +125,7 @@ func DownstreamTLSContext(serverSecret *dag.Secret, tlsMinProtoVersion, tlsMaxPr }, TlsCertificateSdsSecretConfigs: []*envoy_transport_socket_tls_v3.SdsSecretConfig{{ Name: envoy.Secretname(serverSecret), - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }}, AlpnProtocols: alpnProtos, }, diff --git a/internal/envoy/v3/bootstrap.go b/internal/envoy/v3/bootstrap.go index a70d3268c8f..9d92a838a9b 100644 --- a/internal/envoy/v3/bootstrap.go +++ b/internal/envoy/v3/bootstrap.go @@ -169,7 +169,7 @@ func bootstrapConfig(c *envoy.BootstrapConfig) *envoy_config_bootstrap_v3.Bootst LayerSpecifier: &envoy_config_bootstrap_v3.RuntimeLayer_RtdsLayer_{ RtdsLayer: &envoy_config_bootstrap_v3.RuntimeLayer_RtdsLayer{ Name: DynamicRuntimeLayerName, - RtdsConfig: ConfigSource("contour"), + RtdsConfig: ConfigSource(), }, }, }, @@ -187,8 +187,15 @@ func bootstrapConfig(c *envoy.BootstrapConfig) *envoy_config_bootstrap_v3.Bootst }, }, DynamicResources: &envoy_config_bootstrap_v3.Bootstrap_DynamicResources{ - LdsConfig: ConfigSource("contour"), - CdsConfig: ConfigSource("contour"), + AdsConfig: &envoy_config_core_v3.ApiConfigSource{ + ApiType: envoy_config_core_v3.ApiConfigSource_DELTA_GRPC, + TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, + GrpcServices: []*envoy_config_core_v3.GrpcService{ + GrpcService("contour", "", timeout.DefaultSetting()), + }, + }, + LdsConfig: ConfigSource(), + CdsConfig: ConfigSource(), }, StaticResources: &envoy_config_bootstrap_v3.Bootstrap_StaticResources{ Clusters: []*envoy_config_cluster_v3.Cluster{{ diff --git a/internal/envoy/v3/bootstrap_test.go b/internal/envoy/v3/bootstrap_test.go index cc1c9a9fd87..9a47c2fa67e 100644 --- a/internal/envoy/v3/bootstrap_test.go +++ b/internal/envoy/v3/bootstrap_test.go @@ -130,35 +130,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -191,19 +177,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -311,35 +285,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -372,19 +332,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -492,35 +440,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -553,19 +487,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -674,35 +596,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -735,19 +643,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -856,35 +752,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -917,19 +799,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -1038,35 +908,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -1099,19 +955,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -1222,35 +1066,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -1283,19 +1113,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -1440,35 +1258,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -1501,19 +1305,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -1656,35 +1448,21 @@ func TestBootstrap(t *testing.T) { ] }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "default_regex_engine": { @@ -1717,19 +1495,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, @@ -1890,35 +1656,21 @@ func TestBootstrap(t *testing.T) { } }, "dynamic_resources": { + "ads_config": { + "api_type": "DELTA_GRPC", + "transport_api_version": "V3", + "grpc_services": [{ + "envoy_grpc": { + "cluster_name": "contour", + "authority": "contour" + } + }] + }, "lds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} }, "cds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } }, "layered_runtime": { @@ -1928,19 +1680,7 @@ func TestBootstrap(t *testing.T) { "rtds_layer": { "name": "dynamic", "rtds_config": { - "api_config_source": { - "api_type": "GRPC", - "transport_api_version": "V3", - "grpc_services": [ - { - "envoy_grpc": { - "cluster_name": "contour", - "authority": "contour" - } - } - ] - }, - "resource_api_version": "V3" + "ads": {} } } }, diff --git a/internal/envoy/v3/cluster.go b/internal/envoy/v3/cluster.go index 24346c48421..8135dc4036b 100644 --- a/internal/envoy/v3/cluster.go +++ b/internal/envoy/v3/cluster.go @@ -61,7 +61,7 @@ func Cluster(c *dag.Cluster) *envoy_config_cluster_v3.Cluster { case 0: // external name not set, cluster will be discovered via EDS cluster.ClusterDiscoveryType = ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS) - cluster.EdsClusterConfig = edsconfig("contour", service) + cluster.EdsClusterConfig = edsconfig(service) default: // external name set, use hard coded DNS name // external name set to LOGICAL_DNS when user selects the ALL loookup family @@ -156,7 +156,7 @@ func ExtensionCluster(ext *dag.ExtensionCluster) *envoy_config_cluster_v3.Cluste // Cluster will be discovered via EDS. cluster.ClusterDiscoveryType = ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS) cluster.EdsClusterConfig = &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: ext.Upstream.ClusterName, } @@ -231,9 +231,9 @@ func DNSNameCluster(c *dag.DNSNameCluster) *envoy_config_cluster_v3.Cluster { return cluster } -func edsconfig(cluster string, service *dag.Service) *envoy_config_cluster_v3.Cluster_EdsClusterConfig { +func edsconfig(service *dag.Service) *envoy_config_cluster_v3.Cluster_EdsClusterConfig { return &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource(cluster), + EdsConfig: ConfigSource(), ServiceName: xds.ClusterLoadAssignmentName( types.NamespacedName{Name: service.Weighted.ServiceName, Namespace: service.Weighted.ServiceNamespace}, service.Weighted.ServicePort.Name, @@ -280,18 +280,9 @@ func ClusterCommonLBConfig() *envoy_config_cluster_v3.Cluster_CommonLbConfig { } // ConfigSource returns a *envoy_config_core_v3.ConfigSource for cluster. -func ConfigSource(cluster string) *envoy_config_core_v3.ConfigSource { +func ConfigSource() *envoy_config_core_v3.ConfigSource { return &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{ - GrpcService(cluster, "", timeout.DefaultSetting()), - }, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, } } diff --git a/internal/envoy/v3/cluster_test.go b/internal/envoy/v3/cluster_test.go index cc9f64bcec5..9eb31c97835 100644 --- a/internal/envoy/v3/cluster_test.go +++ b/internal/envoy/v3/cluster_test.go @@ -150,7 +150,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, }, @@ -165,7 +165,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TypedExtensionProtocolOptions: map[string]*anypb.Any{ @@ -190,7 +190,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TransportSocket: UpstreamTLSTransportSocket( @@ -305,7 +305,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TransportSocket: UpstreamTLSTransportSocket( @@ -345,7 +345,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TransportSocket: UpstreamTLSTransportSocket( @@ -382,7 +382,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TransportSocket: UpstreamTLSTransportSocket( @@ -423,7 +423,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -457,7 +457,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -491,7 +491,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -525,7 +525,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -559,7 +559,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -583,7 +583,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, LbPolicy: envoy_config_cluster_v3.Cluster_RANDOM, @@ -599,7 +599,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -615,7 +615,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, }, @@ -635,7 +635,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, IgnoreHealthOnHostRemoval: true, @@ -661,7 +661,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TransportSocket: UpstreamTLSTransportSocket( @@ -679,7 +679,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, ConnectTimeout: durationpb.New(10 * time.Second), @@ -695,7 +695,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TypedExtensionProtocolOptions: map[string]*anypb.Any{ @@ -728,7 +728,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, LbConfig: &envoy_config_cluster_v3.Cluster_RoundRobinLbConfig_{ @@ -762,7 +762,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, LbPolicy: envoy_config_cluster_v3.Cluster_LEAST_REQUEST, @@ -792,7 +792,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, PerConnectionBufferLimitBytes: wrapperspb.UInt32(32768), @@ -808,7 +808,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TypedExtensionProtocolOptions: map[string]*anypb.Any{ @@ -840,7 +840,7 @@ func TestCluster(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: ConfigSource("contour"), + EdsConfig: ConfigSource(), ServiceName: "default/kuard/http", }, TypedExtensionProtocolOptions: map[string]*anypb.Any{ diff --git a/internal/envoy/v3/listener.go b/internal/envoy/v3/listener.go index 213a71af9bf..5675da25023 100644 --- a/internal/envoy/v3/listener.go +++ b/internal/envoy/v3/listener.go @@ -490,7 +490,7 @@ func (b *httpConnectionManagerBuilder) Get() *envoy_config_listener_v3.Filter { RouteSpecifier: &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Rds{ Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: b.routeConfigName, - ConfigSource: ConfigSource("contour"), + ConfigSource: ConfigSource(), }, }, Tracing: b.tracingConfig, diff --git a/internal/envoy/v3/listener_test.go b/internal/envoy/v3/listener_test.go index e2aa3a64fee..fe64be3d70f 100644 --- a/internal/envoy/v3/listener_test.go +++ b/internal/envoy/v3/listener_test.go @@ -272,21 +272,7 @@ func TestDownstreamTLSContext(t *testing.T) { tlsCertificateSdsSecretConfigs := []*envoy_transport_socket_tls_v3.SdsSecretConfig{{ Name: envoy.Secretname(serverSecret), SdsConfig: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }} @@ -678,21 +664,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -725,21 +697,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -773,21 +731,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -822,21 +766,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -870,21 +800,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -919,21 +835,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -966,21 +868,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1014,21 +902,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1063,21 +937,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1112,21 +972,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1159,21 +1005,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1220,21 +1052,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1277,21 +1095,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1324,21 +1128,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1372,21 +1162,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, @@ -1421,21 +1197,7 @@ func TestHTTPConnectionManager(t *testing.T) { Rds: &envoy_filter_network_http_connection_manager_v3.Rds{ RouteConfigName: "default/kuard", ConfigSource: &envoy_config_core_v3.ConfigSource{ - ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3, - ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{ - ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{ - ApiType: envoy_config_core_v3.ApiConfigSource_GRPC, - TransportApiVersion: envoy_config_core_v3.ApiVersion_V3, - GrpcServices: []*envoy_config_core_v3.GrpcService{{ - TargetSpecifier: &envoy_config_core_v3.GrpcService_EnvoyGrpc_{ - EnvoyGrpc: &envoy_config_core_v3.GrpcService_EnvoyGrpc{ - ClusterName: "contour", - Authority: "contour", - }, - }, - }}, - }, - }, + ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{}, }, }, }, diff --git a/internal/envoy/v3/stats.go b/internal/envoy/v3/stats.go index a444218db88..1c5848a4eb3 100644 --- a/internal/envoy/v3/stats.go +++ b/internal/envoy/v3/stats.go @@ -194,7 +194,7 @@ func downstreamTLSContext(clientValidation bool) *envoy_transport_socket_tls_v3. }, TlsCertificateSdsSecretConfigs: []*envoy_transport_socket_tls_v3.SdsSecretConfig{{ Name: metricsServerCertSDSName, - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }}, }, } @@ -203,7 +203,7 @@ func downstreamTLSContext(clientValidation bool) *envoy_transport_socket_tls_v3. context.CommonTlsContext.ValidationContextType = &envoy_transport_socket_tls_v3.CommonTlsContext_ValidationContextSdsSecretConfig{ ValidationContextSdsSecretConfig: &envoy_transport_socket_tls_v3.SdsSecretConfig{ Name: metricsCaBundleSDSName, - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }, } context.RequireClientCertificate = wrapperspb.Bool(true) diff --git a/internal/envoy/v3/stats_test.go b/internal/envoy/v3/stats_test.go index cdabc908bf5..f3c32839fdd 100644 --- a/internal/envoy/v3/stats_test.go +++ b/internal/envoy/v3/stats_test.go @@ -216,7 +216,7 @@ func TestStatsListeners(t *testing.T) { }, TlsCertificateSdsSecretConfigs: []*envoy_transport_socket_tls_v3.SdsSecretConfig{{ Name: "metrics-tls-certificate", - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }}, }, }, @@ -307,12 +307,12 @@ func TestStatsListeners(t *testing.T) { }, TlsCertificateSdsSecretConfigs: []*envoy_transport_socket_tls_v3.SdsSecretConfig{{ Name: "metrics-tls-certificate", - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }}, ValidationContextType: &envoy_transport_socket_tls_v3.CommonTlsContext_ValidationContextSdsSecretConfig{ ValidationContextSdsSecretConfig: &envoy_transport_socket_tls_v3.SdsSecretConfig{ Name: "metrics-ca-certificate", - SdsConfig: ConfigSource("contour"), + SdsConfig: ConfigSource(), }, }, }, diff --git a/internal/featuretests/v3/cluster_test.go b/internal/featuretests/v3/cluster_test.go index 2680585ba4b..b5c2e6d0769 100644 --- a/internal/featuretests/v3/cluster_test.go +++ b/internal/featuretests/v3/cluster_test.go @@ -452,7 +452,7 @@ func TestClusterCircuitbreakerAnnotationsIngress(t *testing.T) { AltStatName: "default_kuard_8080", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -490,7 +490,7 @@ func TestClusterCircuitbreakerAnnotationsIngress(t *testing.T) { AltStatName: "default_kuard_8080", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -527,7 +527,7 @@ func TestClusterCircuitbreakerAnnotationsIngress(t *testing.T) { AltStatName: "default_kuard_8080", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -596,7 +596,7 @@ func TestClusterCircuitbreakerAnnotationsHTTPProxy(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -633,7 +633,7 @@ func TestClusterCircuitbreakerAnnotationsHTTPProxy(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -670,7 +670,7 @@ func TestClusterCircuitbreakerAnnotationsHTTPProxy(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -782,7 +782,7 @@ func TestClusterCircuitbreakerAnnotationsGateway(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -819,7 +819,7 @@ func TestClusterCircuitbreakerAnnotationsGateway(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -856,7 +856,7 @@ func TestClusterCircuitbreakerAnnotationsGateway(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -975,7 +975,7 @@ func TestClusterLoadBalancerStrategyPerRoute(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, LbPolicy: envoy_config_cluster_v3.Cluster_RANDOM, @@ -985,7 +985,7 @@ func TestClusterLoadBalancerStrategyPerRoute(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, LbPolicy: envoy_config_cluster_v3.Cluster_LEAST_REQUEST, diff --git a/internal/featuretests/v3/envoy.go b/internal/featuretests/v3/envoy.go index 7b4d1ca8501..c9ac9285132 100644 --- a/internal/featuretests/v3/envoy.go +++ b/internal/featuretests/v3/envoy.go @@ -178,7 +178,7 @@ func cluster(name, servicename, statName string) *envoy_config_cluster_v3.Cluste ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: statName, EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: servicename, }, }) diff --git a/internal/featuretests/v3/loadbalancerpolicy_test.go b/internal/featuretests/v3/loadbalancerpolicy_test.go index d51b7653e7f..732acd84592 100644 --- a/internal/featuretests/v3/loadbalancerpolicy_test.go +++ b/internal/featuretests/v3/loadbalancerpolicy_test.go @@ -61,7 +61,7 @@ func TestLoadBalancerPolicySessionAffinity(t *testing.T) { ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: s1.Namespace + "_" + s1.Name + "_80", EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: s1.Namespace + "/" + s1.Name, }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -113,7 +113,7 @@ func TestLoadBalancerPolicySessionAffinity(t *testing.T) { ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: s1.Namespace + "_" + s1.Name + "_80", EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: s1.Namespace + "/" + s1.Name, }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -123,7 +123,7 @@ func TestLoadBalancerPolicySessionAffinity(t *testing.T) { ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: s1.Namespace + "_" + s1.Name + "_8080", EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: s1.Namespace + "/" + s1.Name, }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -198,7 +198,7 @@ func TestLoadBalancerPolicyRequestHashHeader(t *testing.T) { ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: s1.Namespace + "_" + s1.Name + "_80", EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: s1.Namespace + "/" + s1.Name, }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -268,7 +268,7 @@ func TestLoadBalancerPolicyRequestHashSourceIP(t *testing.T) { ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: s1.Namespace + "_" + s1.Name + "_80", EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: s1.Namespace + "/" + s1.Name, }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -341,7 +341,7 @@ func TestLoadBalancerPolicyRequestHashQueryParameter(t *testing.T) { ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), AltStatName: s1.Namespace + "_" + s1.Name + "_80", EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: s1.Namespace + "/" + s1.Name, }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, diff --git a/internal/xdscache/v3/cluster_test.go b/internal/xdscache/v3/cluster_test.go index b370948c6e8..8a6ebf5097a 100644 --- a/internal/xdscache/v3/cluster_test.go +++ b/internal/xdscache/v3/cluster_test.go @@ -50,7 +50,7 @@ func TestClusterCacheContents(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -60,7 +60,7 @@ func TestClusterCacheContents(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -91,7 +91,7 @@ func TestClusterCacheQuery(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -102,7 +102,7 @@ func TestClusterCacheQuery(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -115,7 +115,7 @@ func TestClusterCacheQuery(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -126,7 +126,7 @@ func TestClusterCacheQuery(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -139,7 +139,7 @@ func TestClusterCacheQuery(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -192,7 +192,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard", }, }), @@ -228,7 +228,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard/https", }, }), @@ -268,7 +268,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard/http", }, TypedExtensionProtocolOptions: map[string]*anypb.Any{ @@ -310,7 +310,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "beurocratic-company-test-domain-1_tiny-cog-department-test-instance_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "beurocratic-company-test-domain-1/tiny-cog-department-test-instance/svc-0", }, }), @@ -358,7 +358,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, }, @@ -367,7 +367,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_8080", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/alt", }, }, @@ -411,7 +411,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, HealthChecks: []*envoy_config_core_v3.HealthCheck{{ @@ -473,7 +473,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, HealthChecks: []*envoy_config_core_v3.HealthCheck{{ @@ -530,7 +530,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, }, @@ -574,7 +574,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, LbPolicy: envoy_config_cluster_v3.Cluster_LEAST_REQUEST, @@ -619,7 +619,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, LbPolicy: envoy_config_cluster_v3.Cluster_RANDOM, @@ -671,7 +671,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, LbPolicy: envoy_config_cluster_v3.Cluster_RING_HASH, @@ -718,7 +718,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_backend_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/backend/http", }, }, @@ -763,7 +763,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_kuard_80", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard/http", }, CircuitBreakers: &envoy_config_cluster_v3.CircuitBreakers{ @@ -817,7 +817,7 @@ func TestClusterVisit(t *testing.T) { AltStatName: "default_kuard_443", ClusterDiscoveryType: envoy_v3.ClusterDiscoveryType(envoy_config_cluster_v3.Cluster_EDS), EdsClusterConfig: &envoy_config_cluster_v3.Cluster_EdsClusterConfig{ - EdsConfig: envoy_v3.ConfigSource("contour"), + EdsConfig: envoy_v3.ConfigSource(), ServiceName: "default/kuard/https", }, }),