From b38d0c9a5580beef1662f57ef10ce71824487c95 Mon Sep 17 00:00:00 2001 From: Jose Ulises Nino Rivera Date: Mon, 12 Jul 2021 11:37:30 -0700 Subject: [PATCH] envoy: 3876d7c0f (#1580) Description: Includes three relevant commits: https://github.com/envoyproxy/envoy/pull/17226 https://github.com/envoyproxy/envoy/pull/17274 https://github.com/envoyproxy/envoy/pull/17207 Signed-off-by: Jose Nino Signed-off-by: Rafal Augustyniak --- envoy | 2 +- library/common/config/config.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/envoy b/envoy index f2906f5ce3..5ab509b54b 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit f2906f5ce372814b8e6f688a0e1766703d8b56f2 +Subproject commit 5ab509b54bf6916235b5f2b65800b9d756032129 diff --git a/library/common/config/config.cc b/library/common/config/config.cc index 975f948a76..7a233b82ef 100644 --- a/library/common/config/config.cc +++ b/library/common/config/config.cc @@ -36,6 +36,7 @@ const std::string config_header = R"( - &dns_refresh_rate 60s - &dns_fail_base_interval 2s - &dns_fail_max_interval 10s +- &dns_query_timeout 25s - &dns_preresolve_hostnames [] - &metadata {} - &stats_domain 127.0.0.1 @@ -180,6 +181,7 @@ const char* config_template = R"( dns_failure_refresh_rate: base_interval: *dns_fail_base_interval max_interval: *dns_fail_max_interval + dns_query_timeout: *dns_query_timeout # TODO: make this configurable for users. - name: envoy.filters.http.decompressor typed_config: