From dff3d3e5ed5e40087de490f3f5f9584457d580ae Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Mon, 24 May 2021 16:54:53 +0100 Subject: [PATCH] configs: Remove unnecessary connect_timeouts Signed-off-by: Ryan Northey --- configs/envoy-demo.yaml | 1 - configs/envoy-tap-config.yaml | 1 - configs/envoy_double_proxy.template.yaml | 3 --- docs/root/_include/ads.yaml | 1 - .../best_practices/_include/edge.yaml | 1 - .../http_conn_man/_include/preserve-case.yaml | 1 - .../_include/bandwidth-limit-filter.yaml | 2 -- .../http/http_filters/_include/composite.yaml | 1 - .../_include/dns-cache-circuit-breaker.yaml | 1 - .../_include/grpc-reverse-bridge-filter.yaml | 2 -- .../_include/grpc-transcoder-filter.yaml | 1 - .../sni-dynamic-forward-proxy-filter.yaml | 1 - .../_include/zookeeper-filter-proxy.yaml | 1 - .../udp_filters/_include/udp-proxy.yaml | 1 - .../intro/_include/life-of-a-request.yaml | 2 -- .../matching/_include/complicated.yaml | 1 - .../matching/_include/request_response.yaml | 1 - .../advanced/matching/_include/simple.yaml | 1 - .../arch_overview/security/_include/ssl.yaml | 1 - .../_include/envoy-demo-tls-client-auth.yaml | 1 - .../_include/envoy-demo-tls-sni.yaml | 1 - .../_include/envoy-demo-tls-validation.yaml | 1 - .../quick-start/_include/envoy-demo-tls.yaml | 1 - .../quick-start/_include/envoy-demo.yaml | 1 - .../_include/envoy-dynamic-cds-demo.yaml | 1 - .../envoy-dynamic-control-plane-demo.yaml | 3 +-- .../configuration-dynamic-control-plane.rst | 4 ++-- .../configuration-dynamic-filesystem.rst | 2 +- .../quick-start/configuration-static.rst | 4 ++-- docs/root/start/quick-start/securing.rst | 22 +++++++++---------- .../dynamic-configuration-filesystem.rst | 2 +- examples/cache/front-envoy.yaml | 2 -- examples/cache/service-envoy.yaml | 1 - examples/cors/backend/front-envoy.yaml | 1 - examples/cors/backend/service-envoy.yaml | 1 - examples/cors/frontend/front-envoy.yaml | 1 - examples/cors/frontend/service-envoy.yaml | 1 - examples/csrf/crosssite/front-envoy.yaml | 1 - examples/csrf/samesite/front-envoy.yaml | 1 - examples/csrf/service-envoy.yaml | 1 - examples/double-proxy/envoy-backend.yaml | 1 - examples/double-proxy/envoy-frontend.yaml | 1 - examples/double-proxy/envoy.yaml | 1 - examples/dynamic-config-cp/envoy.yaml | 3 +-- examples/dynamic-config-fs/configs/cds.yaml | 1 - .../ext_authz/config/grpc-service/v3.yaml | 2 -- examples/ext_authz/config/http-service.yaml | 2 -- examples/ext_authz/config/opa-service/v3.yaml | 2 -- examples/fault-injection/envoy.yaml | 1 - examples/front-proxy/front-envoy.yaml | 2 -- examples/front-proxy/service-envoy.yaml | 1 - examples/grpc-bridge/client/envoy-proxy.yaml | 1 - examples/grpc-bridge/server/envoy-proxy.yaml | 1 - .../front-envoy-jaeger.yaml | 1 - .../service1-envoy-jaeger.yaml | 2 -- .../service2-envoy-jaeger.yaml | 1 - .../jaeger-tracing/front-envoy-jaeger.yaml | 2 -- .../jaeger-tracing/service1-envoy-jaeger.yaml | 3 --- .../jaeger-tracing/service2-envoy-jaeger.yaml | 2 -- .../service-envoy-w-lrs.yaml | 2 -- examples/lua/envoy.yaml | 1 - examples/mysql/envoy.yaml | 1 - examples/postgres/envoy.yaml | 1 - examples/redis/envoy.yaml | 1 - .../front-envoy-skywalking.yaml | 2 -- .../service1-envoy-skywalking.yaml | 3 --- .../service2-envoy-skywalking.yaml | 2 -- examples/tls-inspector/envoy.yaml | 3 --- examples/tls-sni/envoy-client.yaml | 3 --- examples/tls-sni/envoy.yaml | 3 --- examples/tls/envoy-http-https.yaml | 1 - examples/tls/envoy-https-http.yaml | 1 - examples/tls/envoy-https-https.yaml | 1 - examples/tls/envoy-https-passthrough.yaml | 1 - examples/udp/envoy.yaml | 1 - examples/wasm-cc/envoy.yaml | 1 - examples/websocket/envoy-ws.yaml | 1 - examples/websocket/envoy-wss-passthrough.yaml | 1 - examples/websocket/envoy-wss.yaml | 1 - .../zipkin-tracing/front-envoy-zipkin.yaml | 2 -- .../zipkin-tracing/service1-envoy-zipkin.yaml | 3 --- .../zipkin-tracing/service2-envoy-zipkin.yaml | 2 -- 82 files changed, 19 insertions(+), 126 deletions(-) diff --git a/configs/envoy-demo.yaml b/configs/envoy-demo.yaml index f84b00c5eab46..39bfae994947c 100644 --- a/configs/envoy-demo.yaml +++ b/configs/envoy-demo.yaml @@ -37,7 +37,6 @@ static_resources: - name: envoy.filters.http.router clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/configs/envoy-tap-config.yaml b/configs/envoy-tap-config.yaml index f8d4ef0836484..655580c77210b 100644 --- a/configs/envoy-tap-config.yaml +++ b/configs/envoy-tap-config.yaml @@ -37,7 +37,6 @@ static_resources: - name: envoy.filters.http.router clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/configs/envoy_double_proxy.template.yaml b/configs/envoy_double_proxy.template.yaml index 806ba9d03a418..223a0d5ccf86b 100644 --- a/configs/envoy_double_proxy.template.yaml +++ b/configs/envoy_double_proxy.template.yaml @@ -112,7 +112,6 @@ static_resources: clusters: - name: statsd type: STATIC - connect_timeout: 0.25s lb_policy: ROUND_ROBIN load_assignment: cluster_name: statsd @@ -126,7 +125,6 @@ static_resources: protocol: TCP - name: backhaul type: STRICT_DNS - connect_timeout: 1s lb_policy: ROUND_ROBIN load_assignment: cluster_name: backhaul @@ -165,7 +163,6 @@ static_resources: http2_protocol_options: {} - name: lightstep_saas type: LOGICAL_DNS - connect_timeout: 1s lb_policy: ROUND_ROBIN load_assignment: cluster_name: lightstep_saas diff --git a/docs/root/_include/ads.yaml b/docs/root/_include/ads.yaml index 81d30842e113c..962f1eef9b8b5 100644 --- a/docs/root/_include/ads.yaml +++ b/docs/root/_include/ads.yaml @@ -21,7 +21,6 @@ dynamic_resources: static_resources: clusters: - name: ads_cluster - connect_timeout: 5s type: STRICT_DNS load_assignment: cluster_name: ads_cluster diff --git a/docs/root/configuration/best_practices/_include/edge.yaml b/docs/root/configuration/best_practices/_include/edge.yaml index d74f572c3625d..cfcb3c4bd5980 100644 --- a/docs/root/configuration/best_practices/_include/edge.yaml +++ b/docs/root/configuration/best_practices/_include/edge.yaml @@ -78,7 +78,6 @@ static_resources: idle_timeout: 15s # must be disabled for long-lived and streaming requests clusters: - name: service_foo - connect_timeout: 15s per_connection_buffer_limit_bytes: 32768 # 32 KiB load_assignment: cluster_name: some_service diff --git a/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml b/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml index cf637b1eeb7a1..a4ea11ac4af5e 100644 --- a/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml +++ b/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml @@ -28,7 +28,6 @@ static_resources: cluster: service_foo clusters: - name: service_foo - connect_timeout: 15s typed_extension_protocol_options: envoy.extensions.upstreams.http.v3.HttpProtocolOptions: "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions diff --git a/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml b/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml index 9e86c1e6663bc..2f63fb2147bc1 100644 --- a/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml +++ b/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml @@ -38,7 +38,6 @@ static_resources: clusters: - name: service_protected_by_bandwidth_limit - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -51,7 +50,6 @@ static_resources: address: web_service port_value: 9000 - name: web_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/docs/root/configuration/http/http_filters/_include/composite.yaml b/docs/root/configuration/http/http_filters/_include/composite.yaml index 48109818710bf..72d11abde1114 100644 --- a/docs/root/configuration/http/http_filters/_include/composite.yaml +++ b/docs/root/configuration/http/http_filters/_include/composite.yaml @@ -73,7 +73,6 @@ static_resources: clusters: - name: grpc - connect_timeout: 1.25s type: LOGICAL_DNS lb_policy: ROUND_ROBIN dns_lookup_family: V4_ONLY diff --git a/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml b/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml index 1efb16f48c768..8742d6954f5a6 100644 --- a/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml +++ b/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml @@ -48,7 +48,6 @@ static_resources: "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router clusters: - name: dynamic_forward_proxy_cluster - connect_timeout: 1s lb_policy: CLUSTER_PROVIDED cluster_type: name: envoy.clusters.dynamic_forward_proxy diff --git a/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml b/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml index 1cca540f59bdd..4ffc8af0e483e 100644 --- a/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml +++ b/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml @@ -53,7 +53,6 @@ static_resources: typed_config: {} clusters: - name: other - connect_timeout: 5.00s type: LOGICAL_DNS dns_lookup_family: V4_ONLY lb_policy: ROUND_ROBIN @@ -67,7 +66,6 @@ static_resources: address: localhost port_value: 4630 - name: grpc - connect_timeout: 5.00s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml b/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml index 91802786b5101..704b58d4f9b29 100644 --- a/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml +++ b/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml @@ -39,7 +39,6 @@ static_resources: clusters: - name: grpc - connect_timeout: 1.25s type: LOGICAL_DNS lb_policy: ROUND_ROBIN dns_lookup_family: V4_ONLY diff --git a/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml b/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml index 5150a03aba7a3..c78ad55d80324 100644 --- a/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml +++ b/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml @@ -30,7 +30,6 @@ static_resources: cluster: dynamic_forward_proxy_cluster clusters: - name: dynamic_forward_proxy_cluster - connect_timeout: 1s lb_policy: CLUSTER_PROVIDED cluster_type: name: envoy.clusters.dynamic_forward_proxy diff --git a/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml b/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml index aafca89351bf5..a9850d4672243 100644 --- a/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml +++ b/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml @@ -18,7 +18,6 @@ static_resources: cluster: local_zk_server clusters: - name: local_zk_server - connect_timeout: 120s type: LOGICAL_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/docs/root/configuration/listeners/udp_filters/_include/udp-proxy.yaml b/docs/root/configuration/listeners/udp_filters/_include/udp-proxy.yaml index 816a7657fd484..bcffbb1404df5 100644 --- a/docs/root/configuration/listeners/udp_filters/_include/udp-proxy.yaml +++ b/docs/root/configuration/listeners/udp_filters/_include/udp-proxy.yaml @@ -26,7 +26,6 @@ static_resources: max_rx_datagram_size: 9000 clusters: - name: service_udp - connect_timeout: 0.25s type: STATIC lb_policy: ROUND_ROBIN load_assignment: diff --git a/docs/root/intro/_include/life-of-a-request.yaml b/docs/root/intro/_include/life-of-a-request.yaml index 6875f8861a655..9dbe644dcaaeb 100644 --- a/docs/root/intro/_include/life-of-a-request.yaml +++ b/docs/root/intro/_include/life-of-a-request.yaml @@ -58,7 +58,6 @@ static_resources: - name: envoy.filters.http.router clusters: - name: some_service - connect_timeout: 5s # Upstream TLS configuration. transport_socket: name: envoy.transport_sockets.tls @@ -86,7 +85,6 @@ static_resources: http2_protocol_options: max_concurrent_streams: 100 - name: some_statsd_sink - connect_timeout: 5s # The rest of the configuration for statsd sink cluster. # statsd sink. stats_sinks: diff --git a/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml b/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml index 0c385de903e42..a9dd901d638b2 100644 --- a/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml +++ b/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml @@ -81,7 +81,6 @@ static_resources: cluster: service_foo clusters: - name: service_foo - connect_timeout: 15s load_assignment: cluster_name: some_service endpoints: diff --git a/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml b/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml index 78ae0b18b1b79..ff48ee5e13f52 100644 --- a/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml +++ b/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml @@ -67,7 +67,6 @@ static_resources: cluster: service_foo clusters: - name: service_foo - connect_timeout: 15s load_assignment: cluster_name: some_service endpoints: diff --git a/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml b/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml index 9e00c6dba57d9..fdf2f1c8c183a 100644 --- a/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml +++ b/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml @@ -55,7 +55,6 @@ static_resources: cluster: service_foo clusters: - name: service_foo - connect_timeout: 15s load_assignment: cluster_name: some_service endpoints: diff --git a/docs/root/intro/arch_overview/security/_include/ssl.yaml b/docs/root/intro/arch_overview/security/_include/ssl.yaml index 9c6f6224bf287..e23727f0d1473 100644 --- a/docs/root/intro/arch_overview/security/_include/ssl.yaml +++ b/docs/root/intro/arch_overview/security/_include/ssl.yaml @@ -29,7 +29,6 @@ static_resources: filename: certs/cacert.pem clusters: - name: some_service - connect_timeout: 0.25s type: STATIC lb_policy: ROUND_ROBIN load_assignment: diff --git a/docs/root/start/quick-start/_include/envoy-demo-tls-client-auth.yaml b/docs/root/start/quick-start/_include/envoy-demo-tls-client-auth.yaml index d921322280c00..84367c637f686 100644 --- a/docs/root/start/quick-start/_include/envoy-demo-tls-client-auth.yaml +++ b/docs/root/start/quick-start/_include/envoy-demo-tls-client-auth.yaml @@ -44,7 +44,6 @@ static_resources: clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/docs/root/start/quick-start/_include/envoy-demo-tls-sni.yaml b/docs/root/start/quick-start/_include/envoy-demo-tls-sni.yaml index ae2936cabcffa..40f8533e1ce2d 100644 --- a/docs/root/start/quick-start/_include/envoy-demo-tls-sni.yaml +++ b/docs/root/start/quick-start/_include/envoy-demo-tls-sni.yaml @@ -41,7 +41,6 @@ static_resources: clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/docs/root/start/quick-start/_include/envoy-demo-tls-validation.yaml b/docs/root/start/quick-start/_include/envoy-demo-tls-validation.yaml index 4260b1fca986e..b9ad6cc0635e9 100644 --- a/docs/root/start/quick-start/_include/envoy-demo-tls-validation.yaml +++ b/docs/root/start/quick-start/_include/envoy-demo-tls-validation.yaml @@ -28,7 +28,6 @@ static_resources: clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/docs/root/start/quick-start/_include/envoy-demo-tls.yaml b/docs/root/start/quick-start/_include/envoy-demo-tls.yaml index 6e0830d873c0c..960b9e9bca123 100644 --- a/docs/root/start/quick-start/_include/envoy-demo-tls.yaml +++ b/docs/root/start/quick-start/_include/envoy-demo-tls.yaml @@ -38,7 +38,6 @@ static_resources: clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/docs/root/start/quick-start/_include/envoy-demo.yaml b/docs/root/start/quick-start/_include/envoy-demo.yaml index 3d3b025a8b5e1..eaf9469b5aa76 100644 --- a/docs/root/start/quick-start/_include/envoy-demo.yaml +++ b/docs/root/start/quick-start/_include/envoy-demo.yaml @@ -32,7 +32,6 @@ static_resources: clusters: - name: service_envoyproxy_io - connect_timeout: 30s type: LOGICAL_DNS # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY diff --git a/docs/root/start/quick-start/_include/envoy-dynamic-cds-demo.yaml b/docs/root/start/quick-start/_include/envoy-dynamic-cds-demo.yaml index 65e41b87b30ac..fc564cbc9ad02 100644 --- a/docs/root/start/quick-start/_include/envoy-dynamic-cds-demo.yaml +++ b/docs/root/start/quick-start/_include/envoy-dynamic-cds-demo.yaml @@ -1,7 +1,6 @@ resources: - "@type": type.googleapis.com/envoy.config.cluster.v3.Cluster name: example_proxy_cluster - connect_timeout: 1s type: STRICT_DNS typed_extension_protocol_options: envoy.extensions.upstreams.http.v3.HttpProtocolOptions: diff --git a/docs/root/start/quick-start/_include/envoy-dynamic-control-plane-demo.yaml b/docs/root/start/quick-start/_include/envoy-dynamic-control-plane-demo.yaml index e80f175d94f50..e0b300e98bcea 100644 --- a/docs/root/start/quick-start/_include/envoy-dynamic-control-plane-demo.yaml +++ b/docs/root/start/quick-start/_include/envoy-dynamic-control-plane-demo.yaml @@ -18,8 +18,7 @@ dynamic_resources: static_resources: clusters: - - connect_timeout: 1s - type: STRICT_DNS + - type: STRICT_DNS typed_extension_protocol_options: envoy.extensions.upstreams.http.v3.HttpProtocolOptions: "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions diff --git a/docs/root/start/quick-start/configuration-dynamic-control-plane.rst b/docs/root/start/quick-start/configuration-dynamic-control-plane.rst index 1ccdcfc56a745..eb2bbe395b801 100644 --- a/docs/root/start/quick-start/configuration-dynamic-control-plane.rst +++ b/docs/root/start/quick-start/configuration-dynamic-control-plane.rst @@ -69,6 +69,6 @@ The ``xds_cluster`` is configured to query a control plane at http://my-control- .. literalinclude:: _include/envoy-dynamic-control-plane-demo.yaml :language: yaml :linenos: - :lines: 17-39 + :lines: 17-38 :lineno-start: 17 - :emphasize-lines: 3-21 + :emphasize-lines: 3-20 diff --git a/docs/root/start/quick-start/configuration-dynamic-filesystem.rst b/docs/root/start/quick-start/configuration-dynamic-filesystem.rst index a251aa3886054..3fd80238a8d3a 100644 --- a/docs/root/start/quick-start/configuration-dynamic-filesystem.rst +++ b/docs/root/start/quick-start/configuration-dynamic-filesystem.rst @@ -89,4 +89,4 @@ proxies over ``TLS`` to https://www.envoyproxy.io. .. literalinclude:: _include/envoy-dynamic-cds-demo.yaml :language: yaml :linenos: - :emphasize-lines: 12, 18-19, 23-24 + :emphasize-lines: 11, 17-18, 22-23 diff --git a/docs/root/start/quick-start/configuration-static.rst b/docs/root/start/quick-start/configuration-static.rst index c269e7fd293e7..1e6042483f0f0 100644 --- a/docs/root/start/quick-start/configuration-static.rst +++ b/docs/root/start/quick-start/configuration-static.rst @@ -55,5 +55,5 @@ proxies over ``TLS`` to https://www.envoyproxy.io. .. literalinclude:: _include/envoy-demo.yaml :language: yaml :lineno-start: 29 - :lines: 29-52 - :emphasize-lines: 5-24 + :lines: 29-51 + :emphasize-lines: 5-23 diff --git a/docs/root/start/quick-start/securing.rst b/docs/root/start/quick-start/securing.rst index e4e74e17f54d1..cf9f0b558c3c3 100644 --- a/docs/root/start/quick-start/securing.rst +++ b/docs/root/start/quick-start/securing.rst @@ -59,8 +59,8 @@ to the :ref:`transport_socket ` of a :language: yaml :linenos: :lineno-start: 39 - :lines: 39-57 - :emphasize-lines: 16-19 + :lines: 39-56 + :emphasize-lines: 15-18 :caption: :download:`envoy-demo-tls.yaml <_include/envoy-demo-tls.yaml>` .. _start_quick_start_securing_validation: @@ -79,8 +79,8 @@ Firstly, you can ensure that the certificates are from a mutually trusted certif .. literalinclude:: _include/envoy-demo-tls-validation.yaml :language: yaml :linenos: - :lineno-start: 43 - :lines: 43-53 + :lineno-start: 42 + :lines: 42-52 :emphasize-lines: 6-9 :caption: :download:`envoy-demo-tls-validation.yaml <_include/envoy-demo-tls-validation.yaml>` @@ -92,8 +92,8 @@ certificate is valid for. .. literalinclude:: _include/envoy-demo-tls-validation.yaml :language: yaml :linenos: - :lineno-start: 43 - :lines: 43-53 + :lineno-start: 42 + :lines: 42-52 :emphasize-lines: 6-7, 10-11 :caption: :download:`envoy-demo-tls-validation.yaml <_include/envoy-demo-tls-validation.yaml>` @@ -154,9 +154,9 @@ When connecting to an upstream with client certificates you can set them as foll .. literalinclude:: _include/envoy-demo-tls-client-auth.yaml :language: yaml :linenos: - :lineno-start: 45 - :lines: 45-69 - :emphasize-lines: 21-25 + :lineno-start: 44 + :lines: 44-68 + :emphasize-lines: 20-25 :caption: :download:`envoy-demo-tls-client-auth.yaml <_include/envoy-demo-tls-client-auth.yaml>` .. _start_quick_start_securing_sni: @@ -195,8 +195,8 @@ This will usually be the DNS name of the service you are connecting to. .. literalinclude:: _include/envoy-demo-tls-sni.yaml :language: yaml :linenos: - :lineno-start: 56 - :lines: 56-61 + :lineno-start: 55 + :lines: 55-60 :emphasize-lines: 6 :caption: :download:`envoy-demo-tls-sni.yaml <_include/envoy-demo-tls-sni.yaml>` diff --git a/docs/root/start/sandboxes/dynamic-configuration-filesystem.rst b/docs/root/start/sandboxes/dynamic-configuration-filesystem.rst index f3ab8d01051f2..eb52a8f9cf2dc 100644 --- a/docs/root/start/sandboxes/dynamic-configuration-filesystem.rst +++ b/docs/root/start/sandboxes/dynamic-configuration-filesystem.rst @@ -90,7 +90,7 @@ from ``service1`` to ``service2``: .. literalinclude:: _include/dynamic-config-fs/configs/cds.yaml :language: yaml :linenos: - :lines: 6-14 + :lines: 6-13 :lineno-start: 6 :emphasize-lines: 8 diff --git a/examples/cache/front-envoy.yaml b/examples/cache/front-envoy.yaml index 345e96f4f7346..00091a052ca86 100644 --- a/examples/cache/front-envoy.yaml +++ b/examples/cache/front-envoy.yaml @@ -37,7 +37,6 @@ static_resources: clusters: - name: service1 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -50,7 +49,6 @@ static_resources: address: service1 port_value: 8000 - name: service2 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/cache/service-envoy.yaml b/examples/cache/service-envoy.yaml index b3ea728cc5f60..eaa849dd40797 100644 --- a/examples/cache/service-envoy.yaml +++ b/examples/cache/service-envoy.yaml @@ -27,7 +27,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/cors/backend/front-envoy.yaml b/examples/cors/backend/front-envoy.yaml index b6b4f9d63e0b3..cd95621758d0f 100644 --- a/examples/cors/backend/front-envoy.yaml +++ b/examples/cors/backend/front-envoy.yaml @@ -72,7 +72,6 @@ static_resources: typed_config: {} clusters: - name: backend_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/cors/backend/service-envoy.yaml b/examples/cors/backend/service-envoy.yaml index c596eb508ff87..d5943d46ea7ba 100644 --- a/examples/cors/backend/service-envoy.yaml +++ b/examples/cors/backend/service-envoy.yaml @@ -27,7 +27,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/cors/frontend/front-envoy.yaml b/examples/cors/frontend/front-envoy.yaml index 604ada75465b6..51411fafa9234 100644 --- a/examples/cors/frontend/front-envoy.yaml +++ b/examples/cors/frontend/front-envoy.yaml @@ -33,7 +33,6 @@ static_resources: typed_config: {} clusters: - name: frontend_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/cors/frontend/service-envoy.yaml b/examples/cors/frontend/service-envoy.yaml index c596eb508ff87..d5943d46ea7ba 100644 --- a/examples/cors/frontend/service-envoy.yaml +++ b/examples/cors/frontend/service-envoy.yaml @@ -27,7 +27,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/csrf/crosssite/front-envoy.yaml b/examples/csrf/crosssite/front-envoy.yaml index 114b0f06ddd03..18f8be37fa47d 100644 --- a/examples/csrf/crosssite/front-envoy.yaml +++ b/examples/csrf/crosssite/front-envoy.yaml @@ -31,7 +31,6 @@ static_resources: typed_config: {} clusters: - name: generic_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/csrf/samesite/front-envoy.yaml b/examples/csrf/samesite/front-envoy.yaml index c8fc0c77eb3de..de99d4a8c4f13 100644 --- a/examples/csrf/samesite/front-envoy.yaml +++ b/examples/csrf/samesite/front-envoy.yaml @@ -103,7 +103,6 @@ static_resources: typed_config: {} clusters: - name: generic_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/csrf/service-envoy.yaml b/examples/csrf/service-envoy.yaml index c596eb508ff87..d5943d46ea7ba 100644 --- a/examples/csrf/service-envoy.yaml +++ b/examples/csrf/service-envoy.yaml @@ -27,7 +27,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/double-proxy/envoy-backend.yaml b/examples/double-proxy/envoy-backend.yaml index 598749325af49..d04f33f2996f5 100644 --- a/examples/double-proxy/envoy-backend.yaml +++ b/examples/double-proxy/envoy-backend.yaml @@ -38,7 +38,6 @@ static_resources: clusters: - name: postgres_cluster - connect_timeout: 1s type: STRICT_DNS load_assignment: cluster_name: postgres_cluster diff --git a/examples/double-proxy/envoy-frontend.yaml b/examples/double-proxy/envoy-frontend.yaml index 49cee39333250..af836ba8fc30d 100644 --- a/examples/double-proxy/envoy-frontend.yaml +++ b/examples/double-proxy/envoy-frontend.yaml @@ -19,7 +19,6 @@ static_resources: clusters: - name: postgres_cluster - connect_timeout: 1s type: STRICT_DNS load_assignment: cluster_name: postgres_cluster diff --git a/examples/double-proxy/envoy.yaml b/examples/double-proxy/envoy.yaml index 97fb2c039d2d3..a962715924720 100644 --- a/examples/double-proxy/envoy.yaml +++ b/examples/double-proxy/envoy.yaml @@ -27,7 +27,6 @@ static_resources: clusters: - name: service1 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/dynamic-config-cp/envoy.yaml b/examples/dynamic-config-cp/envoy.yaml index 9b7eb57dd1b90..aafd750656cfb 100644 --- a/examples/dynamic-config-cp/envoy.yaml +++ b/examples/dynamic-config-cp/envoy.yaml @@ -18,8 +18,7 @@ dynamic_resources: static_resources: clusters: - - connect_timeout: 1s - type: STRICT_DNS + - type: STRICT_DNS typed_extension_protocol_options: envoy.extensions.upstreams.http.v3.HttpProtocolOptions: "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions diff --git a/examples/dynamic-config-fs/configs/cds.yaml b/examples/dynamic-config-fs/configs/cds.yaml index f22089e0c7f0a..8cc9e3c0b26cd 100644 --- a/examples/dynamic-config-fs/configs/cds.yaml +++ b/examples/dynamic-config-fs/configs/cds.yaml @@ -1,7 +1,6 @@ resources: - "@type": type.googleapis.com/envoy.config.cluster.v3.Cluster name: example_proxy_cluster - connect_timeout: 1s type: STRICT_DNS load_assignment: cluster_name: example_proxy_cluster diff --git a/examples/ext_authz/config/grpc-service/v3.yaml b/examples/ext_authz/config/grpc-service/v3.yaml index 8ad48325eb410..f42f332137957 100644 --- a/examples/ext_authz/config/grpc-service/v3.yaml +++ b/examples/ext_authz/config/grpc-service/v3.yaml @@ -36,7 +36,6 @@ static_resources: clusters: - name: upstream-service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -50,7 +49,6 @@ static_resources: port_value: 8080 - name: ext_authz-grpc-service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/examples/ext_authz/config/http-service.yaml b/examples/ext_authz/config/http-service.yaml index 1bfb7df4ff96b..581f48961d131 100644 --- a/examples/ext_authz/config/http-service.yaml +++ b/examples/ext_authz/config/http-service.yaml @@ -41,7 +41,6 @@ static_resources: clusters: - name: upstream-service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -55,7 +54,6 @@ static_resources: port_value: 8080 - name: ext_authz-http-service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/ext_authz/config/opa-service/v3.yaml b/examples/ext_authz/config/opa-service/v3.yaml index 72dd285de3ea6..f5a6697cb4661 100644 --- a/examples/ext_authz/config/opa-service/v3.yaml +++ b/examples/ext_authz/config/opa-service/v3.yaml @@ -36,7 +36,6 @@ static_resources: clusters: - name: upstream-service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -50,7 +49,6 @@ static_resources: port_value: 8080 - name: ext_authz-opa-service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/examples/fault-injection/envoy.yaml b/examples/fault-injection/envoy.yaml index 1cce4ec52aea8..a526edb6fa016 100644 --- a/examples/fault-injection/envoy.yaml +++ b/examples/fault-injection/envoy.yaml @@ -44,7 +44,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/front-proxy/front-envoy.yaml b/examples/front-proxy/front-envoy.yaml index d96a5d31538c3..b97ac7b278fa9 100644 --- a/examples/front-proxy/front-envoy.yaml +++ b/examples/front-proxy/front-envoy.yaml @@ -126,7 +126,6 @@ static_resources: clusters: - name: service1 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -139,7 +138,6 @@ static_resources: address: service1 port_value: 8000 - name: service2 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/front-proxy/service-envoy.yaml b/examples/front-proxy/service-envoy.yaml index b3ea728cc5f60..eaa849dd40797 100644 --- a/examples/front-proxy/service-envoy.yaml +++ b/examples/front-proxy/service-envoy.yaml @@ -27,7 +27,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/grpc-bridge/client/envoy-proxy.yaml b/examples/grpc-bridge/client/envoy-proxy.yaml index 91ea427889885..c96d32a6dfc43 100644 --- a/examples/grpc-bridge/client/envoy-proxy.yaml +++ b/examples/grpc-bridge/client/envoy-proxy.yaml @@ -40,7 +40,6 @@ static_resources: type: LOGICAL_DNS dns_lookup_family: V4_ONLY lb_policy: ROUND_ROBIN - connect_timeout: 0.250s http_protocol_options: {} load_assignment: cluster_name: backend-proxy diff --git a/examples/grpc-bridge/server/envoy-proxy.yaml b/examples/grpc-bridge/server/envoy-proxy.yaml index d03dd25c53d73..8e63706b5aaa6 100644 --- a/examples/grpc-bridge/server/envoy-proxy.yaml +++ b/examples/grpc-bridge/server/envoy-proxy.yaml @@ -32,7 +32,6 @@ static_resources: typed_config: {} clusters: - name: backend_grpc_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/examples/jaeger-native-tracing/front-envoy-jaeger.yaml b/examples/jaeger-native-tracing/front-envoy-jaeger.yaml index 9569202399179..a32051d5dc7bb 100644 --- a/examples/jaeger-native-tracing/front-envoy-jaeger.yaml +++ b/examples/jaeger-native-tracing/front-envoy-jaeger.yaml @@ -52,7 +52,6 @@ static_resources: use_remote_address: true clusters: - name: service1 - connect_timeout: 0.250s type: strict_dns lb_policy: round_robin load_assignment: diff --git a/examples/jaeger-native-tracing/service1-envoy-jaeger.yaml b/examples/jaeger-native-tracing/service1-envoy-jaeger.yaml index cfb10f3259431..7614f6354c883 100644 --- a/examples/jaeger-native-tracing/service1-envoy-jaeger.yaml +++ b/examples/jaeger-native-tracing/service1-envoy-jaeger.yaml @@ -78,7 +78,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.250s type: strict_dns lb_policy: round_robin load_assignment: @@ -91,7 +90,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: service2 - connect_timeout: 0.250s type: strict_dns lb_policy: round_robin load_assignment: diff --git a/examples/jaeger-native-tracing/service2-envoy-jaeger.yaml b/examples/jaeger-native-tracing/service2-envoy-jaeger.yaml index b2349b7fac9a6..a56ba608c3120 100644 --- a/examples/jaeger-native-tracing/service2-envoy-jaeger.yaml +++ b/examples/jaeger-native-tracing/service2-envoy-jaeger.yaml @@ -50,7 +50,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.250s type: strict_dns lb_policy: round_robin load_assignment: diff --git a/examples/jaeger-tracing/front-envoy-jaeger.yaml b/examples/jaeger-tracing/front-envoy-jaeger.yaml index 831175b810b29..b5ac02f727e66 100644 --- a/examples/jaeger-tracing/front-envoy-jaeger.yaml +++ b/examples/jaeger-tracing/front-envoy-jaeger.yaml @@ -41,7 +41,6 @@ static_resources: use_remote_address: true clusters: - name: service1 - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -54,7 +53,6 @@ static_resources: address: service1 port_value: 8000 - name: jaeger - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/jaeger-tracing/service1-envoy-jaeger.yaml b/examples/jaeger-tracing/service1-envoy-jaeger.yaml index a33970821c97d..7ef911a69ea80 100644 --- a/examples/jaeger-tracing/service1-envoy-jaeger.yaml +++ b/examples/jaeger-tracing/service1-envoy-jaeger.yaml @@ -76,7 +76,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -89,7 +88,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: service2 - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -102,7 +100,6 @@ static_resources: address: service2 port_value: 8000 - name: jaeger - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/jaeger-tracing/service2-envoy-jaeger.yaml b/examples/jaeger-tracing/service2-envoy-jaeger.yaml index c48878e9c1891..afb0a2d70df5f 100644 --- a/examples/jaeger-tracing/service2-envoy-jaeger.yaml +++ b/examples/jaeger-tracing/service2-envoy-jaeger.yaml @@ -39,7 +39,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -52,7 +51,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: jaeger - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/load-reporting-service/service-envoy-w-lrs.yaml b/examples/load-reporting-service/service-envoy-w-lrs.yaml index e908f8ff15826..c5da0d64a1651 100644 --- a/examples/load-reporting-service/service-envoy-w-lrs.yaml +++ b/examples/load-reporting-service/service-envoy-w-lrs.yaml @@ -27,7 +27,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -40,7 +39,6 @@ static_resources: address: 127.0.0.1 port_value: 8082 - name: load_reporting_cluster - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/lua/envoy.yaml b/examples/lua/envoy.yaml index f469888229908..a9cc2555282e1 100644 --- a/examples/lua/envoy.yaml +++ b/examples/lua/envoy.yaml @@ -42,7 +42,6 @@ static_resources: clusters: - name: web_service - connect_timeout: 0.25s type: STRICT_DNS # static lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/mysql/envoy.yaml b/examples/mysql/envoy.yaml index b530e0e2f6942..4760b2c3eaca4 100644 --- a/examples/mysql/envoy.yaml +++ b/examples/mysql/envoy.yaml @@ -19,7 +19,6 @@ static_resources: clusters: - name: mysql_cluster - connect_timeout: 1s type: STRICT_DNS load_assignment: cluster_name: mysql_cluster diff --git a/examples/postgres/envoy.yaml b/examples/postgres/envoy.yaml index 5433bc54b6ebf..bc3bbe7b373e1 100644 --- a/examples/postgres/envoy.yaml +++ b/examples/postgres/envoy.yaml @@ -19,7 +19,6 @@ static_resources: clusters: - name: postgres_cluster - connect_timeout: 1s type: STRICT_DNS load_assignment: cluster_name: postgres_cluster diff --git a/examples/redis/envoy.yaml b/examples/redis/envoy.yaml index d9f4bd9450b41..1960f7925daf9 100644 --- a/examples/redis/envoy.yaml +++ b/examples/redis/envoy.yaml @@ -18,7 +18,6 @@ static_resources: cluster: redis_cluster clusters: - name: redis_cluster - connect_timeout: 1s type: STRICT_DNS # static lb_policy: MAGLEV load_assignment: diff --git a/examples/skywalking-tracing/front-envoy-skywalking.yaml b/examples/skywalking-tracing/front-envoy-skywalking.yaml index 61baeec4add10..eddedbb407873 100644 --- a/examples/skywalking-tracing/front-envoy-skywalking.yaml +++ b/examples/skywalking-tracing/front-envoy-skywalking.yaml @@ -45,7 +45,6 @@ static_resources: start_child_span: true clusters: - name: service1 - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: @@ -63,7 +62,6 @@ static_resources: address: service1 port_value: 8000 - name: skywalking - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/examples/skywalking-tracing/service1-envoy-skywalking.yaml b/examples/skywalking-tracing/service1-envoy-skywalking.yaml index fc3220bb5a000..96937a17b4fcd 100644 --- a/examples/skywalking-tracing/service1-envoy-skywalking.yaml +++ b/examples/skywalking-tracing/service1-envoy-skywalking.yaml @@ -86,7 +86,6 @@ static_resources: start_child_span: true clusters: - name: local_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -99,7 +98,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: service2 - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: @@ -117,7 +115,6 @@ static_resources: address: service2 port_value: 8000 - name: skywalking - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/examples/skywalking-tracing/service2-envoy-skywalking.yaml b/examples/skywalking-tracing/service2-envoy-skywalking.yaml index 0cdb6ded67a5a..5a9eb92e9dd7d 100644 --- a/examples/skywalking-tracing/service2-envoy-skywalking.yaml +++ b/examples/skywalking-tracing/service2-envoy-skywalking.yaml @@ -44,7 +44,6 @@ static_resources: start_child_span: true clusters: - name: local_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -57,7 +56,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: skywalking - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN typed_extension_protocol_options: diff --git a/examples/tls-inspector/envoy.yaml b/examples/tls-inspector/envoy.yaml index d4462920d8916..634f82075de0c 100644 --- a/examples/tls-inspector/envoy.yaml +++ b/examples/tls-inspector/envoy.yaml @@ -43,7 +43,6 @@ static_resources: clusters: - name: service-https-http2 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -56,7 +55,6 @@ static_resources: address: service-https-http2 port_value: 443 - name: service-https-http1.1 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -69,7 +67,6 @@ static_resources: address: service-https-http1.1 port_value: 443 - name: service-http - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/tls-sni/envoy-client.yaml b/examples/tls-sni/envoy-client.yaml index e64aae12dc2a6..b99bbeead452c 100644 --- a/examples/tls-sni/envoy-client.yaml +++ b/examples/tls-sni/envoy-client.yaml @@ -35,7 +35,6 @@ static_resources: clusters: - name: proxy-client-domain1 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -54,7 +53,6 @@ static_resources: sni: domain1.example.com - name: proxy-client-domain2 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -73,7 +71,6 @@ static_resources: sni: domain2.example.com - name: proxy-client-domain3 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/tls-sni/envoy.yaml b/examples/tls-sni/envoy.yaml index 7ad9843c6d8c4..b6248f9d748ae 100644 --- a/examples/tls-sni/envoy.yaml +++ b/examples/tls-sni/envoy.yaml @@ -85,7 +85,6 @@ static_resources: clusters: - name: proxy-domain1 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -99,7 +98,6 @@ static_resources: port_value: 80 - name: proxy-domain2 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -113,7 +111,6 @@ static_resources: port_value: 80 - name: proxy-domain3 - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/tls/envoy-http-https.yaml b/examples/tls/envoy-http-https.yaml index 0695099e89814..ae532dd7c355e 100644 --- a/examples/tls/envoy-http-https.yaml +++ b/examples/tls/envoy-http-https.yaml @@ -27,7 +27,6 @@ static_resources: clusters: - name: service-https - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/tls/envoy-https-http.yaml b/examples/tls/envoy-https-http.yaml index 79496d520e00d..640b0ca8429d1 100644 --- a/examples/tls/envoy-https-http.yaml +++ b/examples/tls/envoy-https-http.yaml @@ -90,7 +90,6 @@ static_resources: clusters: - name: service-http - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/tls/envoy-https-https.yaml b/examples/tls/envoy-https-https.yaml index 2702adb6b8e91..13a60d4d9c361 100644 --- a/examples/tls/envoy-https-https.yaml +++ b/examples/tls/envoy-https-https.yaml @@ -90,7 +90,6 @@ static_resources: clusters: - name: service-https - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/tls/envoy-https-passthrough.yaml b/examples/tls/envoy-https-passthrough.yaml index 3c7a221ff0604..8707204a5c416 100644 --- a/examples/tls/envoy-https-passthrough.yaml +++ b/examples/tls/envoy-https-passthrough.yaml @@ -14,7 +14,6 @@ static_resources: clusters: - name: service-https - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/udp/envoy.yaml b/examples/udp/envoy.yaml index 6ae56223a2fca..9937bba45f1f9 100644 --- a/examples/udp/envoy.yaml +++ b/examples/udp/envoy.yaml @@ -16,7 +16,6 @@ static_resources: clusters: - name: service_udp - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/wasm-cc/envoy.yaml b/examples/wasm-cc/envoy.yaml index 1d04c7a26f62c..e65d4e6ce8265 100644 --- a/examples/wasm-cc/envoy.yaml +++ b/examples/wasm-cc/envoy.yaml @@ -47,7 +47,6 @@ static_resources: clusters: - name: web_service - connect_timeout: 0.25s type: strict_dns lb_policy: round_robin load_assignment: diff --git a/examples/websocket/envoy-ws.yaml b/examples/websocket/envoy-ws.yaml index aa670d2bd412e..5db9005f3d531 100644 --- a/examples/websocket/envoy-ws.yaml +++ b/examples/websocket/envoy-ws.yaml @@ -28,7 +28,6 @@ static_resources: clusters: - name: service_ws - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/websocket/envoy-wss-passthrough.yaml b/examples/websocket/envoy-wss-passthrough.yaml index 5d546329c3e18..6634d483def68 100644 --- a/examples/websocket/envoy-wss-passthrough.yaml +++ b/examples/websocket/envoy-wss-passthrough.yaml @@ -14,7 +14,6 @@ static_resources: clusters: - name: service_wss_passthrough - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/websocket/envoy-wss.yaml b/examples/websocket/envoy-wss.yaml index 8e94de35f5915..f4dee8fd0bd7b 100644 --- a/examples/websocket/envoy-wss.yaml +++ b/examples/websocket/envoy-wss.yaml @@ -91,7 +91,6 @@ static_resources: clusters: - name: service_wss - connect_timeout: 0.25s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/zipkin-tracing/front-envoy-zipkin.yaml b/examples/zipkin-tracing/front-envoy-zipkin.yaml index 599b28d009b56..7fc5cfb61f70e 100644 --- a/examples/zipkin-tracing/front-envoy-zipkin.yaml +++ b/examples/zipkin-tracing/front-envoy-zipkin.yaml @@ -46,7 +46,6 @@ static_resources: typed_config: {} clusters: - name: service1 - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -59,7 +58,6 @@ static_resources: address: service1 port_value: 8000 - name: zipkin - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/zipkin-tracing/service1-envoy-zipkin.yaml b/examples/zipkin-tracing/service1-envoy-zipkin.yaml index b006bed4b4195..fd790aa3c1e94 100644 --- a/examples/zipkin-tracing/service1-envoy-zipkin.yaml +++ b/examples/zipkin-tracing/service1-envoy-zipkin.yaml @@ -74,7 +74,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -87,7 +86,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: service2 - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -100,7 +98,6 @@ static_resources: address: service2 port_value: 8000 - name: zipkin - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: diff --git a/examples/zipkin-tracing/service2-envoy-zipkin.yaml b/examples/zipkin-tracing/service2-envoy-zipkin.yaml index be152059d2348..2078d93d00777 100644 --- a/examples/zipkin-tracing/service2-envoy-zipkin.yaml +++ b/examples/zipkin-tracing/service2-envoy-zipkin.yaml @@ -38,7 +38,6 @@ static_resources: typed_config: {} clusters: - name: local_service - connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: @@ -51,7 +50,6 @@ static_resources: address: 127.0.0.1 port_value: 8080 - name: zipkin - connect_timeout: 1s type: STRICT_DNS lb_policy: ROUND_ROBIN load_assignment: