Skip to content

Docs: Update reference configurations YAML templates for Struct deprecation for Any and hosts deprecation for load_assignment #6368

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
htuch merged 11 commits into from
Mar 27, 2019
Merged

Docs: Update reference configurations YAML templates for Struct deprecation for Any and hosts deprecation for load_assignment #6368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b0d6eab
Docs and sandboxes: Remove reference to Docker Machine, fix sandbox c…
moderation Mar 20, 2019
89bab5a
Standardize on pulling fresh images before launching containers.
moderation Mar 20, 2019
02ad9d2
Explicitly add DNS for Docker containers for edge case where host mac…
moderation Mar 21, 2019
c132c98
Standardize on upcase E for Envoy in the docs.
moderation Mar 21, 2019
f43b900
Text formatting fixes.
moderation Mar 21, 2019
1d15d33
Merge remote-tracking branch 'upstream/master'
moderation Mar 21, 2019
86a1615
Merge remote-tracking branch 'upstream/master'
moderation Mar 21, 2019
58a19fb
Merge remote-tracking branch 'upstream/master'
moderation Mar 22, 2019
2e0627b
Docs: Update examples for Struct deprecation for Any
moderation Mar 23, 2019
87cd0fb
Merge remote-tracking branch 'upstream/master'
moderation Mar 24, 2019
9a8cc18
Standardize on double quote for @type declarations.
moderation Mar 26, 2019
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
75 changes: 49 additions & 26 deletions configs/envoy_double_proxy_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
{%endif -%}
filters:
- name: envoy.http_connection_manager
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
codec_type: AUTO
stat_prefix: router
route_config:
Expand All @@ -42,14 +43,18 @@
timeout: 20s
http_filters:
- name: envoy.health_check
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck
pass_through_mode: false
endpoint: /healthcheck
name: envoy.buffer
config:
headers:
- exact_match: /healthcheck
name: :path
- name: envoy.buffer
typed_config:
"@type": type.googleapis.com/envoy.config.filter.http.buffer.v2.Buffer
max_request_bytes: 5242880
name: envoy.router
config: {}
- name: envoy.router
typed_config: {}
tracing:
operation_name: INGRESS
idle_timeout: 840s
Expand All @@ -71,7 +76,8 @@
default_value: 1000
runtime_key: access_log.access_error.duration
- traceable_filter: {}
config:
typed_config:
"@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
path: /var/log/envoy/access_error.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)%\" \"%REQ(X-LYFT-USER-ID)%\" \"%RESP(GRPC-STATUS)%\"\n"
{% if proxy_proto %}
Expand All @@ -91,20 +97,30 @@ static_resources:
type: STATIC
connect_timeout: 0.25s
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
protocol: TCP
address: 127.0.0.1
port_value: 8125
load_assignment:
cluster_name: statsd
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: 127.0.0.1
port_value: 8125
protocol: TCP
- name: backhaul
type: STRICT_DNS
connect_timeout: 1s
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
protocol: TCP
address: front-proxy.yourcompany.net
port_value: 9400
load_assignment:
cluster_name: backhaul
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: front-proxy.yourcompany.net
port_value: 9400
protocol: TCP
# There are so few connections going back
# that we can get some imbalance. Until we come up
# with a better solution just limit the requests
Expand All @@ -127,11 +143,16 @@ static_resources:
type: LOGICAL_DNS
connect_timeout: 1s
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
protocol: TCP
address: collector-grpc.lightstep.com
port_value: 443
load_assignment:
cluster_name: lightstep_saas
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: collector-grpc.lightstep.com
port_value: 443
protocol: TCP
http2_protocol_options: {}
tls_context:
common_tls_context:
Expand All @@ -143,20 +164,22 @@ static_resources:
flags_path: "/etc/envoy/flags"
stats_sinks:
- name: envoy.statsd
config:
typed_config:
"@type": type.googleapis.com/envoy.config.metrics.v2.StatsdSink
tcp_cluster_name: statsd
tracing:
http:
name: envoy.lightstep
config:
typed_config:
"@type": type.googleapis.com/envoy.config.trace.v2.LightstepConfig
access_token_file: "/etc/envoy/lightstep_access_token"
collector_cluster: lightstep_saas
runtime:
symlink_root: "/srv/runtime_data/current"
subdirectory: envoy
override_subdirectory: envoy_override
admin:
access_log_path: "var/log/envoy/admin_access.log"
access_log_path: "/var/log/envoy/admin_access.log"
address:
socket_address:
protocol: TCP
Expand Down
62 changes: 41 additions & 21 deletions configs/envoy_front_proxy_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
{%endif %}
filters:
- name: envoy.http_connection_manager
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
codec_type: AUTO
stat_prefix: router
{% if proxy_proto -%}
Expand All @@ -42,13 +43,15 @@
{{ router_file_content(router_file='envoy_router_v2.template.yaml')|indent(10) }}
http_filters:
- name: envoy.health_check
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck
pass_through_mode: false
headers:
- name: ":path"
exact_match: "/healthcheck"
- name: envoy.buffer
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.http.buffer.v2.Buffer
max_request_bytes: 5242880
- name: envoy.rate_limit
config:
Expand All @@ -59,7 +62,7 @@
envoy_grpc:
cluster_name: ratelimit
- name: envoy.router
config: {}
typed_config: {}
add_user_agent: true
tracing:
operation_name: INGRESS
Expand All @@ -82,7 +85,8 @@
default_value: 1000
runtime_key: access_log.access_error.duration
- traceable_filter: {}
config:
typed_config:
"@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
path: "/var/log/envoy/access_error.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)%\" \"%REQ(X-LYFT-USER-ID)%\" \"%RESP(GRPC-STATUS)%\"\n"
{% endmacro -%}
Expand All @@ -100,29 +104,44 @@ static_resources:
type: STRICT_DNS
connect_timeout: 0.25s
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
protocol: TCP
address: disccovery.yourcompany.net
port_value: 80
load_assignment:
cluster_name: sds
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: discovery.yourcompany.net
port_value: 80
protocol: TCP
- name: statsd
type: STATIC
connect_timeout: 0.25s
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
protocol: TCP
address: 127.0.0.1
port_value: 8125
load_assignment:
cluster_name: statsd
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: 127.0.0.1
port_value: 8125
protocol: TCP
- name: lightstep_saas
type: LOGICAL_DNS
connect_timeout: 1s
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
protocol: TCP
address: collector-grpc.lightstep.com
port_value: 443
load_assignment:
cluster_name: lightstep_saas
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: collector-grpc.lightstep.com
port_value: 443
protocol: TCP
http2_protocol_options: {}
{% for service, options in clusters.items() -%}
- {{ helper.internal_cluster_definition(service, options)|indent(2) }}
Expand All @@ -134,7 +153,8 @@ flags_path: /etc/envoy/flags
tracing:
http:
name: envoy.lightstep
config:
typed_config:
"@type": type.googleapis.com/envoy.config.trace.v2.LightstepConfig
collector_cluster: lightstep_saas
access_token_file: "/etc/envoy/lightstep_access_token"
runtime:
Expand Down
Loading