Skip to content

config: cleaning up deprecated configs #2295

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 1 commit into from
May 20, 2022
Merged

config: cleaning up deprecated configs #2295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions library/common/config/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,11 @@ const char* config_template = R"(
wait_for_warm_on_init: false
connect_timeout: *connect_timeout
dns_refresh_rate: *dns_refresh_rate
http2_protocol_options: {}
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicit_http_config:
http2_protocol_options: {}
lb_policy: ROUND_ROBIN
load_assignment:
cluster_name: stats
Expand Down Expand Up @@ -389,7 +393,11 @@ R"(
circuit_breakers: *circuit_breakers_settings
typed_extension_protocol_options: *h1_protocol_options
- name: base_h2
http2_protocol_options: {}
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicit_http_config:
http2_protocol_options: {}
Copy link
Contributor

@goaway goaway May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm - this will still configure this cluster to use h2 without protocol negotiation, correct?

Copy link
Contributor Author

@alyssawilk alyssawilk May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, auto_config does alpn, explicit_http does whatever protocol you explicitly configure.

connect_timeout: *connect_timeout
lb_policy: CLUSTER_PROVIDED
cluster_type: *base_cluster_type
Expand Down Expand Up @@ -454,9 +462,13 @@ stats_sinks: *stats_sinks
regex: '^vhost.api.vcluster\.[\w]+?\.upstream_rq_(?:[12345]xx|retry.*|time|timeout|total)'
use_all_default_tags:
false
watchdog:
megamiss_timeout: 60s
miss_timeout: 60s
watchdogs:
main_thread_watchdog:
megamiss_timeout: 60s
miss_timeout: 60s
worker_watchdog:
megamiss_timeout: 60s
miss_timeout: 60s
node:
id: envoy-mobile
cluster: envoy-mobile
Expand Down