Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions api/XDS_PROTOCOL.md
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,15 @@ static_resources:
- name: ads_cluster
connect_timeout: { seconds: 5 }
type: STATIC
hosts:
- socket_address:
address: <ADS management server IP address>
port_value: <ADS management server port>
load_assignment:
cluster_name: ads_cluster
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should make cluster_name optional for these embedded scenarios? This information is strictly redundant. @dio @mattklein123 ?

Copy link
Member

Choose a reason for hiding this comment

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

@htuch do you think this does make sense?

Copy link
Member

Choose a reason for hiding this comment

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

@dio sort of. I think we can do this today by removing the check from PGV and putting it in Envoy at the consuming sites. I'm not sure how to do it generically though, ideas?

endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: <ADS management server IP address>
port_value: <ADS management server port>
lb_policy: ROUND_ROBIN
http2_protocol_options: {}
upstream_connection_options:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ in the configuration snippet below:
filter_chains:
- filters:
- name: envoy.filters.network.zookeeper_proxy
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.zookeeper_proxy.v1alpha1.ZooKeeperProxy
stat_prefix: zookeeper
- name: envoy.tcp_proxy
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy
stat_prefix: tcp
cluster: ...

Expand Down
18 changes: 12 additions & 6 deletions docs/root/faq/configure_flow_control.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ the only one which needs to be amended is the listener
name: http
address:
socketAddress:
address: '::1'
address: ::1
portValue: 0
filterChains:
filters:
name: envoy.http_connection_manager
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
http2_protocol_options:
initial_stream_window_size: 65535
route_config: {}
Expand All @@ -59,7 +60,12 @@ the only one which needs to be amended is the listener
name: cluster_0
connectTimeout: 5s
perConnectionBufferLimitBytes: 1024
hosts:
socketAddress:
address: '::1'
portValue: 46685
load_assignment:
cluster_name: cluster_0
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: ::1
port_value: 46685
13 changes: 11 additions & 2 deletions test/config/integration/google_com_proxy_port_0.v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ static_resources:
filter_chains:
- filters:
- name: envoy.http_connection_manager
config:
typed_config:
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
stat_prefix: ingress_http
codec_type: AUTO
route_config:
Expand All @@ -33,4 +34,12 @@ static_resources:
# Comment out the following line to test on v6 networks
dns_lookup_family: {{ dns_lookup_family }}
lb_policy: ROUND_ROBIN
hosts: [{ socket_address: { address: google.com, port_value: 443 }}]
load_assignment:
cluster_name: service_google
endpoints:
- lb_endpoints:
- endpoint:
address:
socket_address:
address: google.com
port_value: 443
Loading