Skip to content

release: flipping fatal-by-defaults #8847

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

Closed
alyssawilk wants to merge 6 commits into from
Closed

release: flipping fatal-by-defaults #8847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78aff42
release: flipping flags and fatal-by-defaults
alyssawilk Nov 1, 2019
a9ac01e
only doing one thing at a time
alyssawilk Nov 1, 2019
37c6335
cleanup, finally
alyssawilk Dec 12, 2019
c67a8f6
Merge branch 'master' into flips
alyssawilk Dec 12, 2019
34ddfde
config fixups
alyssawilk Dec 12, 2019
1dc8649
reviewer comments
alyssawilk Dec 12, 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
6 changes: 5 additions & 1 deletion configs/envoy_double_proxy_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
codec_type: AUTO
stat_prefix: router
common_http_protocol_options:
idle_timeout: 840s
Comment on lines +35 to +36
Copy link
Member

@mattklein123 mattklein123 Dec 12, 2019

Choose a reason for hiding this comment

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

How did this pass tests in the first place? Shouldn't this have failed somehow on the compile time options build?

Copy link
Contributor Author

@alyssawilk alyssawilk Dec 12, 2019

Choose a reason for hiding this comment

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

We had the example configs test tagged as excluded. I'll go and fix that as I think it's more trouble than it's worth.

route_config:
name: local_route
virtual_hosts:
Expand Down Expand Up @@ -60,7 +62,9 @@
typed_config: {}
tracing:
operation_name: INGRESS
idle_timeout: 840s
common_http_protocol_options:
idle_timeout: 840s
http2_protocol_options: {}
Copy link
Member

@mattklein123 mattklein123 Dec 12, 2019

Choose a reason for hiding this comment

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

?

Copy link
Contributor Author

@alyssawilk alyssawilk Dec 12, 2019

Choose a reason for hiding this comment

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

oops, fixed

Copy link
Member

@mattklein123 mattklein123 Dec 13, 2019

Choose a reason for hiding this comment

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

Did you mean to delete this?

access_log:
- name: envoy.file_access_log
filter:
Expand Down
3 changes: 2 additions & 1 deletion configs/envoy_front_proxy_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
add_user_agent: true
tracing:
operation_name: INGRESS
idle_timeout: 840s
common_http_protocol_options:
idle_timeout: 840s
access_log:
- name: envoy.file_access_log
filter:
Expand Down
21 changes: 11 additions & 10 deletions configs/envoy_service_to_service_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
protocol: {{protocol}}
address: {{address}}
port_value: {{port_value}}
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
Expand Down Expand Up @@ -94,9 +95,8 @@
"@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
path: "/var/log/envoy/ingress_http_sampled.log"
{{ access_log_helper.ingress_sampled_log()|indent(10)}}
idle_timeout: 840s
tracing:
operation_name: INGRESS
common_http_protocol_options:
idle_timeout: 840s
{% endmacro -%}
static_resources:
listeners:
Expand All @@ -106,6 +106,7 @@ static_resources:
protocol: TCP
port_value: 9001
address: 127.0.0.1
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
Expand All @@ -127,9 +128,8 @@ static_resources:
{{ helper.make_route_internal(service, options)|indent(16) }}
{% endfor %}
add_user_agent: true
tracing:
operation_name: EGRESS
idle_timeout: 840s
common_http_protocol_options:
idle_timeout: 840s
access_log:
- name: envoy.file_access_log
filter:
Expand Down Expand Up @@ -171,6 +171,7 @@ static_resources:
protocol: TCP
port_value: 9002
address: 127.0.0.1
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
Expand All @@ -187,9 +188,8 @@ static_resources:
cluster_name: "rds"
route_config_name: rds_config_for_listener_1
add_user_agent: true
tracing:
operation_name: EGRESS
idle_timeout: 840s
common_http_protocol_options:
idle_timeout: 840s
access_log:
- name: envoy.file_access_log
filter:
Expand Down Expand Up @@ -239,7 +239,8 @@ static_resources:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
codec_type: AUTO
idle_timeout: 840s
common_http_protocol_options:
idle_timeout: 840s
stat_prefix: egress_{{ mapping['name'] }}
#update access_logs here
route_config:
Expand Down
2 changes: 1 addition & 1 deletion configs/original-dst-cluster/proxy_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static_resources:
- name: cluster1
type: ORIGINAL_DST
connect_timeout: 6s
lb_policy: ORIGINAL_DST_LB
lb_policy: CLUSTER_PROVIDED
dns_lookup_family: V4_ONLY
cluster_manager: {}
watchdog: {}
Expand Down
12 changes: 8 additions & 4 deletions examples/cors/backend/front-envoy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ static_resources:
domains:
- "*"
cors:
allow_origin:
- "*"
allow_origin_string_match:
- safe_regex:
google_re2: {}
regex: \*
allow_methods: "GET"
filter_enabled:
default_value:
Expand Down Expand Up @@ -55,8 +57,10 @@ static_resources:
route:
cluster: backend_service
cors:
allow_origin:
- "envoyproxy.io"
allow_origin_string_match:
- safe_regex:
google_re2: {}
regex: .*\.envoyproxy\.io
allow_methods: "GET"
- match:
prefix: "/"
Expand Down
3 changes: 2 additions & 1 deletion examples/grpc-bridge/client/envoy-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ static_resources:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
codec_type: auto
add_user_agent: true
idle_timeout: 0.840s
access_log:
- name: envoy.file_access_log
typed_config:
"@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
path: "/dev/stdout"
stat_prefix: egress_http
common_http_protocol_options:
idle_timeout: 0.840s
use_remote_address: true
route_config:
name: local_route
Expand Down
3 changes: 1 addition & 2 deletions examples/jaeger-native-tracing/front-envoy-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
generate_request_id: true
tracing:
operation_name: egress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand Down
6 changes: 2 additions & 4 deletions examples/jaeger-native-tracing/service1-envoy-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: ingress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand All @@ -33,13 +32,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 9000
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: egress
codec_type: auto
stat_prefix: egress_http
route_config:
Expand Down
3 changes: 1 addition & 2 deletions examples/jaeger-native-tracing/service2-envoy-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: ingress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand Down
4 changes: 2 additions & 2 deletions examples/jaeger-tracing/front-envoy-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
generate_request_id: true
tracing:
operation_name: egress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand Down Expand Up @@ -67,6 +66,7 @@ tracing:
collector_cluster: jaeger
collector_endpoint: "/api/v1/spans"
shared_span_context: false
collector_endpoint_version: HTTP_JSON
admin:
access_log_path: "/dev/null"
address:
Expand Down
7 changes: 3 additions & 4 deletions examples/jaeger-tracing/service1-envoy-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: ingress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand All @@ -33,13 +32,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 9000
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: egress
codec_type: auto
stat_prefix: egress_http
route_config:
Expand Down Expand Up @@ -107,6 +105,7 @@ tracing:
collector_cluster: jaeger
collector_endpoint: "/api/v1/spans"
shared_span_context: false
collector_endpoint_version: HTTP_JSON
admin:
access_log_path: "/dev/null"
address:
Expand Down
4 changes: 2 additions & 2 deletions examples/jaeger-tracing/service2-envoy-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: ingress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand Down Expand Up @@ -64,6 +63,7 @@ tracing:
collector_cluster: jaeger
collector_endpoint: "/api/v1/spans"
shared_span_context: false
collector_endpoint_version: HTTP_JSON
admin:
access_log_path: "/dev/null"
address:
Expand Down
4 changes: 2 additions & 2 deletions examples/zipkin-tracing/front-envoy-zipkin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
generate_request_id: true
tracing:
operation_name: egress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand Down Expand Up @@ -72,6 +71,7 @@ tracing:
"@type": type.googleapis.com/envoy.config.trace.v2.ZipkinConfig
collector_cluster: zipkin
collector_endpoint: "/api/v1/spans"
collector_endpoint_version: HTTP_JSON
admin:
access_log_path: "/dev/null"
address:
Expand Down
7 changes: 3 additions & 4 deletions examples/zipkin-tracing/service1-envoy-zipkin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: ingress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand All @@ -33,13 +32,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 9000
traffic_direction: OUTBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: egress
codec_type: auto
stat_prefix: egress_http
route_config:
Expand Down Expand Up @@ -106,6 +104,7 @@ tracing:
"@type": type.googleapis.com/envoy.config.trace.v2.ZipkinConfig
collector_cluster: zipkin
collector_endpoint: "/api/v1/spans"
collector_endpoint_version: HTTP_JSON
admin:
access_log_path: "/dev/null"
address:
Expand Down
4 changes: 2 additions & 2 deletions examples/zipkin-tracing/service2-envoy-zipkin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ static_resources:
socket_address:
address: 0.0.0.0
port_value: 80
traffic_direction: INBOUND
filter_chains:
- filters:
- name: envoy.http_connection_manager
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
tracing:
operation_name: ingress
codec_type: auto
stat_prefix: ingress_http
route_config:
Expand Down Expand Up @@ -63,6 +62,7 @@ tracing:
"@type": type.googleapis.com/envoy.config.trace.v2.ZipkinConfig
collector_cluster: zipkin
collector_endpoint: "/api/v1/spans"
collector_endpoint_version: HTTP_JSON
admin:
access_log_path: "/dev/null"
address:
Expand Down
Loading