diff --git a/api/XDS_PROTOCOL.md b/api/XDS_PROTOCOL.md index 75f7d8f54e0ce..6a533d0c3c0df 100644 --- a/api/XDS_PROTOCOL.md +++ b/api/XDS_PROTOCOL.md @@ -291,10 +291,15 @@ static_resources: - name: ads_cluster connect_timeout: { seconds: 5 } type: STATIC - hosts: - - socket_address: - address: - port_value: + load_assignment: + cluster_name: ads_cluster + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: + port_value: lb_policy: ROUND_ROBIN http2_protocol_options: {} upstream_connection_options: diff --git a/docs/root/configuration/network_filters/zookeeper_proxy_filter.rst b/docs/root/configuration/network_filters/zookeeper_proxy_filter.rst index cf8e1c9716a72..589e0ff83556b 100644 --- a/docs/root/configuration/network_filters/zookeeper_proxy_filter.rst +++ b/docs/root/configuration/network_filters/zookeeper_proxy_filter.rst @@ -28,10 +28,12 @@ in the configuration snippet below: filter_chains: - filters: - name: envoy.filters.network.zookeeper_proxy - config: + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.zookeeper_proxy.v1alpha1.ZooKeeperProxy stat_prefix: zookeeper - name: envoy.tcp_proxy - config: + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy stat_prefix: tcp cluster: ... diff --git a/docs/root/faq/configure_flow_control.rst b/docs/root/faq/configure_flow_control.rst index f1a94ca2e4099..eb3e1e17df066 100644 --- a/docs/root/faq/configure_flow_control.rst +++ b/docs/root/faq/configure_flow_control.rst @@ -42,12 +42,13 @@ the only one which needs to be amended is the listener name: http address: socketAddress: - address: '::1' + address: ::1 portValue: 0 filterChains: filters: name: envoy.http_connection_manager - config: + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager http2_protocol_options: initial_stream_window_size: 65535 route_config: {} @@ -59,7 +60,12 @@ the only one which needs to be amended is the listener name: cluster_0 connectTimeout: 5s perConnectionBufferLimitBytes: 1024 - hosts: - socketAddress: - address: '::1' - portValue: 46685 + load_assignment: + cluster_name: cluster_0 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: ::1 + port_value: 46685 \ No newline at end of file diff --git a/test/config/integration/google_com_proxy_port_0.v2.yaml b/test/config/integration/google_com_proxy_port_0.v2.yaml index feafcd384925a..d4cf96dfd148a 100644 --- a/test/config/integration/google_com_proxy_port_0.v2.yaml +++ b/test/config/integration/google_com_proxy_port_0.v2.yaml @@ -15,7 +15,8 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager stat_prefix: ingress_http codec_type: AUTO route_config: @@ -33,4 +34,12 @@ static_resources: # Comment out the following line to test on v6 networks dns_lookup_family: {{ dns_lookup_family }} lb_policy: ROUND_ROBIN - hosts: [{ socket_address: { address: google.com, port_value: 443 }}] + load_assignment: + cluster_name: service_google + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: google.com + port_value: 443 \ No newline at end of file diff --git a/test/config/integration/server.yaml b/test/config/integration/server.yaml index 11c5bf992d08a..ead69f084ecf1 100644 --- a/test/config/integration/server.yaml +++ b/test/config/integration/server.yaml @@ -7,67 +7,93 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - drain_timeout_ms: 5000 - route_config: - virtual_hosts: - - require_ssl: all - routes: - - cluster: cluster_1 - prefix: "/" - domains: - - www.redirect.com - name: redirect - - routes: - - prefix: "/" + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + access_log: + - name: envoy.file_access_log + filter: + or_filter: + filters: + - status_code_filter: + comparison: + op: GE + value: + default_value: 400 + runtime_key: access_log.access_error.status + - duration_filter: + comparison: + op: GE + value: + default_value: 1000000 + runtime_key: access_log.access_error.duration + typed_config: + "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog + format: '[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% + %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% + %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" + "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" + "%REQUEST_DURATION%" "%RESPONSE_DURATION%"' + path: /dev/null + codec_type: http1 + drain_timeout: 5s + http_filters: + - name: envoy.health_check + typed_config: + "@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck + headers: + - exact_match: /healthcheck + name: :path + pass_through_mode: false + - name: envoy.rate_limit + config: + domain: foo + rate_limit_service: + grpc_service: + envoy_grpc: + cluster_name: ratelimit + - name: envoy.router + typed_config: {} + route_config: + virtual_hosts: + - domains: + - www.redirect.com + name: redirect + require_tls: all + routes: + - match: + prefix: / + runtime_fraction: + default_value: + numerator: 0 + denominator: HUNDRED + runtime_key: some_key + route: + cluster: cluster_1 + - domains: + - "*" + name: integration + routes: + - match: + prefix: / + route: + cluster: cluster_1 + - match: + prefix: /test/long/url + route: cluster: cluster_1 - runtime: - key: some_key - default: 0 - - prefix: "/test/long/url" rate_limits: - actions: - - type: destination_cluster - cluster: cluster_1 - - prefix: "/test/" + - destination_cluster: {} + - match: + prefix: /test/ + route: cluster: cluster_2 - - prefix: "/websocket/test" - prefix_rewrite: "/websocket" + - match: + prefix: /websocket/test + route: + prefix_rewrite: /websocket cluster: cluster_1 - domains: - - "*" - name: integration - codec_type: http1 - stat_prefix: router - filters: - - name: health_check - config: - endpoint: "/healthcheck" - pass_through_mode: false - - name: rate_limit - config: - domain: foo - - name: router - config: {} - access_log: - - format: '[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% - %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% - %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" - "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" - "%REQUEST_DURATION%" "%RESPONSE_DURATION%"' - path: "/dev/null" - filter: - filters: - - type: status_code - op: ">=" - value: 500 - - type: duration - op: ">=" - value: 1000000 - type: logical_or - - path: "/dev/null" - deprecated_v1: true + stat_prefix: router - address: socket_address: address: {{ ip_loopback_address }} @@ -75,76 +101,99 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - filters: - - name: health_check - config: - endpoint: "/healthcheck" - pass_through_mode: false - - name: rate_limit - config: - domain: foo - - name: router - config: {} - access_log: - - filter: - type: logical_or + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + access_log: + - name: envoy.file_access_log + filter: + or_filter: filters: - - value: 500 - type: status_code - op: ">=" - - type: duration - op: ">=" - value: 1555500 + - status_code_filter: + comparison: + op: GE + value: + default_value: 500 + runtime_key: access_log.access_error.status + - duration_filter: + comparison: + op: GE + value: + default_value: 1555500 + runtime_key: access_log.access_error.duration + typed_config: + "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog format: '[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" "%REQUEST_DURATION%" "%RESPONSE_DURATION%"' - path: "/dev/null" - - path: "/dev/null" - drain_timeout_ms: 5000 - route_config: - virtual_hosts: - - routes: - - prefix: "/" + path: /dev/null + codec_type: http1 + drain_timeout: 5s + http_filters: + - name: envoy.health_check + typed_config: + "@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck + headers: + - exact_match: /healthcheck + name: :path + pass_through_mode: false + - name: envoy.rate_limit + config: + domain: foo + rate_limit_service: + grpc_service: + envoy_grpc: + cluster_name: ratelimit + - name: envoy.router + typed_config: {} + route_config: + virtual_hosts: + - domains: + - www.redirect.com + name: redirect + require_tls: all + routes: + - match: + prefix: / + route: cluster: cluster_1 - domains: - - www.redirect.com - name: redirect - require_ssl: all - - routes: - - prefix: "/" + - domains: + - www.namewithport.com:1234 + name: redirect + require_tls: all + routes: + - match: + prefix: / + runtime_fraction: + default_value: + numerator: 0 + denominator: HUNDRED + runtime_key: some_key + route: cluster: cluster_1 - domains: - - www.namewithport.com:1234 - name: redirect - require_ssl: all - - routes: - - cluster: cluster_1 - runtime: - key: some_key - default: 0 - prefix: "/" - - rate_limits: + rate_limits: - actions: - - type: destination_cluster + - destination_cluster: {} + - match: + prefix: /test/long/url + route: cluster: cluster_1 - prefix: "/test/long/url" - - prefix: "/test/" + - match: + prefix: /test/ + route: cluster: cluster_2 - - cluster: cluster_1 - prefix: "/websocket/test" - prefix_rewrite: "/websocket" - domains: - - "*" - name: integration - codec_type: http1 - stat_prefix: router - http1_settings: - allow_absolute_url: true - deprecated_v1: true + - match: + prefix: /websocket/test + route: + cluster: cluster_1 + prefix_rewrite: /websocket + - domains: + - "*" + name: integration + http_protocol_options: + allow_absolute_url: true + stat_prefix: router - address: socket_address: address: {{ ip_loopback_address }} @@ -152,22 +201,23 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - route_config: - virtual_hosts: - - routes: - - cluster: cluster_3 - prefix: "/test/long/url" - domains: - - "*" - name: integration - filters: - - name: router - config: {} - codec_type: http1 - stat_prefix: router - deprecated_v1: true + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + codec_type: http1 + http_filters: + - name: envoy.router + typed_config: {} + route_config: + virtual_hosts: + - domains: + - "*" + name: integration + routes: + - match: + prefix: /test/long/url + route: + cluster: cluster_3 + stat_prefix: router per_connection_buffer_limit_bytes: 1024 - address: socket_address: @@ -176,24 +226,25 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - filters: - - name: http_dynamo_filter - config: {} - - name: router - config: {} - codec_type: http1 - stat_prefix: router - route_config: - virtual_hosts: - - routes: - - cluster: cluster_3 - prefix: "/dynamo/url" - domains: - - "*" - name: integration - deprecated_v1: true + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + codec_type: http1 + http_filters: + - name: envoy.http_dynamo_filter + typed_config: {} + - name: envoy.router + typed_config: {} + route_config: + virtual_hosts: + - domains: + - "*" + name: integration + routes: + - match: + prefix: /dynamo/url + route: + cluster: cluster_3 + stat_prefix: router per_connection_buffer_limit_bytes: 1024 - address: socket_address: @@ -202,24 +253,25 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - route_config: - virtual_hosts: - - domains: - - "*" - name: integration - routes: - - prefix: "/test/long/url" + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + codec_type: http1 + http_filters: + - name: envoy.grpc_http1_bridge + typed_config: {} + - name: envoy.router + typed_config: {} + route_config: + virtual_hosts: + - domains: + - "*" + name: integration + routes: + - match: + prefix: /test/long/url + route: cluster: cluster_3 - filters: - - name: grpc_http1_bridge - config: {} - - name: router - config: {} - codec_type: http1 - stat_prefix: router - deprecated_v1: true + stat_prefix: router per_connection_buffer_limit_bytes: 1024 - address: socket_address: @@ -228,70 +280,97 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - drain_timeout_ms: 5000 - route_config: - virtual_hosts: - - routes: - - cluster: cluster_1 - prefix: "/" - domains: - - www.redirect.com - name: redirect - require_ssl: all - - routes: - - cluster: cluster_1 - runtime: - key: some_key - default: 0 - prefix: "/" - - prefix: "/test/long/url" - rate_limits: - - actions: - - type: destination_cluster - cluster: cluster_1 - - prefix: "/test/" - cluster: cluster_2 - - prefix: "/websocket/test" - prefix_rewrite: "/websocket" - cluster: cluster_1 - domains: - - "*" - name: integration - codec_type: http1 - stat_prefix: router - filters: - - name: health_check - config: - endpoint: "/healthcheck" - pass_through_mode: false - - name: rate_limit - config: - domain: foo - - name: buffer - config: - max_request_bytes: 5242880 - - config: {} - name: router - access_log: - - filter: + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + access_log: + - name: envoy.file_access_log + filter: + or_filter: filters: - - op: ">=" - value: 500 - type: status_code - - type: duration - op: ">=" - value: 1555500 - type: logical_or + - status_code_filter: + comparison: + op: GE + value: + default_value: 500 + runtime_key: access_log.access_error.status + - duration_filter: + comparison: + op: GE + value: + default_value: 1555500 + runtime_key: access_log.access_error.duration + typed_config: + "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog format: '[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" "%REQUEST_DURATION%" "%RESPONSE_DURATION%"' - path: "/dev/null" - - path: "/dev/null" - deprecated_v1: true + path: /dev/null + codec_type: http1 + drain_timeout: 5s + http_filters: + - name: envoy.health_check + typed_config: + "@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck + headers: + - exact_match: /healthcheck + name: :path + pass_through_mode: false + - name: envoy.rate_limit + config: + domain: foo + rate_limit_service: + grpc_service: + envoy_grpc: + cluster_name: ratelimit + - name: envoy.buffer + typed_config: + "@type": type.googleapis.com/envoy.config.filter.http.buffer.v2.Buffer + max_request_bytes: 5242880 + - name: envoy.router + typed_config: {} + route_config: + virtual_hosts: + - domains: + - www.redirect.com + name: redirect + require_tls: all + routes: + - match: + prefix: / + route: + cluster: cluster_1 + - domains: + - "*" + name: integration + routes: + - match: + prefix: / + runtime_fraction: + default_value: + numerator: 0 + denominator: HUNDRED + runtime_key: some_key + route: + cluster: cluster_1 + - match: + prefix: /test/long/url + route: + cluster: cluster_1 + rate_limits: + - actions: + - destination_cluster: {} + - match: + prefix: /test/ + route: + cluster: cluster_2 + - match: + prefix: /websocket/test + route: + cluster: cluster_1 + prefix_rewrite: /websocket + stat_prefix: router - address: socket_address: address: {{ ip_loopback_address }} @@ -299,18 +378,21 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - filters: - - name: router - config: {} - codec_type: http1 - stat_prefix: rds_dummy - rds: - api_type: REST - route_config_name: foo - cluster: rds - deprecated_v1: true + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + codec_type: http1 + http_filters: + - name: envoy.router + typed_config: {} + rds: + config_source: + api_config_source: + api_type: REST + cluster_names: + - rds + refresh_delay: 5s + route_config_name: foo + stat_prefix: rds_dummy - address: socket_address: address: {{ ip_loopback_address }} @@ -318,75 +400,114 @@ static_resources: filter_chains: - filters: - name: envoy.redis_proxy - config: - value: - conn_pool: - op_timeout_ms: 400 - stat_prefix: redis - cluster_name: redis - deprecated_v1: true + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.redis_proxy.v2.RedisProxy + cluster: redis + settings: + op_timeout: 0.4s + stat_prefix: redis clusters: - name: cds connect_timeout: 5s - hosts: - - socket_address: - address: {{ ip_loopback_address }} - port_value: 4 - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: cds + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: {{ ip_loopback_address }} + port_value: 4 + dns_lookup_family: {{ dns_lookup_family }} - name: rds connect_timeout: 5s - hosts: - - socket_address: - address: {{ ip_loopback_address }} - port_value: 4 - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: rds + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: {{ ip_loopback_address }} + port_value: 4 + dns_lookup_family: {{ dns_lookup_family }} - name: lds connect_timeout: 5s - hosts: - - socket_address: - address: {{ ip_loopback_address }} - port_value: 4 - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: lds + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: {{ ip_loopback_address }} + port_value: 4 + dns_lookup_family: {{ dns_lookup_family }} - name: cluster_1 connect_timeout: 5s - hosts: - - socket_address: - address: {{ ip_loopback_address }} - port_value: {{ upstream_0 }} - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: cluster_1 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: {{ ip_loopback_address }} + port_value: {{ upstream_0 }} + dns_lookup_family: {{ dns_lookup_family }} - name: cluster_2 type: STRICT_DNS connect_timeout: 5s - hosts: - - socket_address: - address: localhost - port_value: {{ upstream_1 }} - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: cluster_2 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: localhost + port_value: {{ upstream_1 }} + dns_lookup_family: {{ dns_lookup_family }} - name: cluster_3 connect_timeout: 5s per_connection_buffer_limit_bytes: 1024 - hosts: - - socket_address: - address: {{ ip_loopback_address }} - port_value: {{ upstream_0 }} - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: cluster_3 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: {{ ip_loopback_address }} + port_value: {{ upstream_0 }} + dns_lookup_family: {{ dns_lookup_family }} - name: statsd type: STRICT_DNS connect_timeout: 5s - hosts: - - socket_address: - address: localhost - port_value: 4 - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: statsd + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: localhost + port_value: 4 + dns_lookup_family: {{ dns_lookup_family }} - name: redis type: STRICT_DNS connect_timeout: 5s lb_policy: RING_HASH - hosts: - - socket_address: - address: localhost - port_value: 4 - dns_lookup_family: "{{ dns_lookup_family }}" + load_assignment: + cluster_name: redis + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: localhost + port_value: 4 + dns_lookup_family: {{ dns_lookup_family }} outlier_detection: {} dynamic_resources: lds_config: @@ -402,10 +523,11 @@ dynamic_resources: - cds refresh_delay: 30s cluster_manager: {} -flags_path: "/invalid_flags" +flags_path: /invalid_flags stats_sinks: - name: envoy.statsd - config: + typed_config: + "@type": type.googleapis.com/envoy.config.metrics.v2.StatsdSink address: socket_address: address: {{ ip_loopback_address }} @@ -416,12 +538,12 @@ stats_sinks: tcp_cluster_name: statsd watchdog: {} runtime: - symlink_root: "{{ test_rundir }}/test/common/runtime/test_data/current" + symlink_root: {{ test_rundir }}/test/common/runtime/test_data/current subdirectory: envoy override_subdirectory: envoy_override admin: - access_log_path: "/dev/null" - profile_path: "{{ test_tmpdir }}/envoy.prof" + access_log_path: /dev/null + profile_path: {{ test_tmpdir }}/envoy.prof address: socket_address: address: {{ ip_loopback_address }} diff --git a/test/config/integration/server_ads.yaml b/test/config/integration/server_ads.yaml index 3400df7e47e58..07b8d293ac25f 100644 --- a/test/config/integration/server_ads.yaml +++ b/test/config/integration/server_ads.yaml @@ -11,10 +11,15 @@ static_resources: - name: ads_cluster connect_timeout: { seconds: 5 } type: STATIC - hosts: - - socket_address: - address: {{ ntop_ip_loopback_address }} - port_value: {{ ads_upstream }} + load_assignment: + cluster_name: ads_cluster + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: {{ ntop_ip_loopback_address }} + port_value: {{ ads_upstream }} lb_policy: ROUND_ROBIN http2_protocol_options: {} admin: diff --git a/test/config/integration/server_unix_listener.yaml b/test/config/integration/server_unix_listener.yaml index f76f3bd126b47..de4f85b78bfee 100644 --- a/test/config/integration/server_unix_listener.yaml +++ b/test/config/integration/server_unix_listener.yaml @@ -6,30 +6,37 @@ static_resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: - value: - filters: - - name: router - config: {} - codec_type: auto - stat_prefix: router - drain_timeout_ms: 5000 - route_config: - virtual_hosts: - - domains: - - "*" - name: vhost_0 - routes: - - prefix: "/" + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + codec_type: auto + drain_timeout: 5s + http_filters: + - name: envoy.router + typed_config: {} + route_config: + name: local_route + virtual_hosts: + - domains: + - "*" + name: vhost_0 + routes: + - match: + prefix: / + route: cluster: cluster_0 - deprecated_v1: true + stat_prefix: router clusters: - name: cluster_0 connect_timeout: 5s - hosts: - - socket_address: - address: "{{ ip_loopback_address }}" - port_value: 0 + load_assignment: + cluster_name: cluster_0 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: "{{ ip_loopback_address }}" + port_value: 0 dns_lookup_family: V4_ONLY cluster_manager: {} watchdog: {} diff --git a/test/config/integration/server_xds.lds.yaml b/test/config/integration/server_xds.lds.yaml index c23cff5ffcf44..777ee0e51e4cd 100644 --- a/test/config/integration/server_xds.lds.yaml +++ b/test/config/integration/server_xds.lds.yaml @@ -9,7 +9,8 @@ resources: filter_chains: - filters: - name: envoy.http_connection_manager - config: + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager codec_type: HTTP2 drain_timeout: 5s stat_prefix: router diff --git a/test/server/zipkin_tracing.yaml b/test/server/zipkin_tracing.yaml index a8fd31b5aadf1..28abe300f3a6b 100644 --- a/test/server/zipkin_tracing.yaml +++ b/test/server/zipkin_tracing.yaml @@ -5,6 +5,7 @@ static_resources: tracing: http: name: envoy.zipkin - config: + typed_config: + "@type": type.googleapis.com/envoy.config.trace.v2.ZipkinConfig collector_cluster: zipkin collector_endpoint: "/api/v1/spans"