Skip to content

config: hopefully fixing C++ config default for apple #2355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssawilk merged 2 commits into from
Jun 13, 2022
Merged

config: hopefully fixing C++ config default for apple #2355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3f8fa2
config: hopefully fixing C++ config default for apple
alyssawilk Jun 9, 2022
4d52371
comments
alyssawilk Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions library/common/config/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,17 @@ const std::string config_header = R"(
- &dns_multiple_addresses true
- &dns_preresolve_hostnames []
- &dns_refresh_rate 60s
- &dns_resolver_name envoy.network.dns_resolver.cares
)"
#if defined(__APPLE__)
R"(- &dns_resolver_name envoy.network.dns_resolver.apple
- &dns_resolver_config {"@type":"type.googleapis.com/envoy.extensions.network.dns_resolver.apple.v3.AppleDnsResolverConfig"}
)"
#else
R"(- &dns_resolver_name envoy.network.dns_resolver.cares
- &dns_resolver_config {"@type":"type.googleapis.com/envoy.extensions.network.dns_resolver.cares.v3.CaresDnsResolverConfig"}
- &enable_drain_post_dns_refresh false
)"
#endif
R"(- &enable_drain_post_dns_refresh false
- &enable_interface_binding false
- &h2_connection_keepalive_idle_interval 100000s
- &h2_connection_keepalive_timeout 10s
Expand Down
1 change: 0 additions & 1 deletion library/objective-c/EnvoyConfiguration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ - (nullable NSString *)resolveTemplate:(NSString *)templateYAML {
[definitions appendFormat:@"- &h2_delay_keepalive_timeout %@\n",
self.h2ExtendKeepaliveTimeout ? @"true" : @"false"];
[definitions appendFormat:@"- &dns_refresh_rate %lus\n", (unsigned long)self.dnsRefreshSeconds];
[definitions appendFormat:@"- &dns_resolver_name envoy.network.dns_resolver.apple\n"];
[definitions appendFormat:@"- &enable_drain_post_dns_refresh %@\n",
self.enableDrainPostDnsRefresh ? @"true" : @"false"];
// No additional values are currently needed for Apple-based DNS resolver.
Expand Down