Skip to content

Commit 5f6e6a2

Browse files
committed
yamllint fixes
1 parent a4aceda commit 5f6e6a2

File tree

2 files changed

+137
-123
lines changed

2 files changed

+137
-123
lines changed

reverse_tunnel/initiator-envoy.yaml

Lines changed: 64 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -7,74 +7,77 @@ node:
77
bootstrap_extensions:
88
- name: envoy.bootstrap.reverse_tunnel.downstream_socket_interface
99
typed_config:
10-
"@type": type.googleapis.com/envoy.extensions.bootstrap.reverse_tunnel.downstream_socket_interface.v3.DownstreamReverseConnectionSocketInterface
10+
"@type": >-
11+
type.googleapis.com/envoy.extensions.bootstrap.reverse_tunnel.downstream_socket_interface.v3.DownstreamReverseConnectionSocketInterface
1112
stat_prefix: "downstream_reverse_connection"
1213

1314
static_resources:
1415
listeners:
15-
# Initiates reverse connections to upstream using custom resolver
16-
- name: reverse_conn_listener
17-
listener_filters_timeout: 0s
18-
listener_filters:
19-
# Use custom address with reverse connection metadata encoded in URL format
20-
address:
21-
socket_address:
22-
# This encodes: src_node_id=downstream-node, src_cluster_id=downstream, src_tenant_id=downstream
23-
# and remote clusters: upstream with 1 connection
24-
address: "rc://downstream-node:downstream-cluster:downstream-tenant@upstream-cluster:1"
25-
port_value: 0
26-
# Use custom resolver that can parse reverse connection metadata
27-
resolver_name: "envoy.resolvers.reverse_connection"
28-
filter_chains:
29-
- filters:
30-
- name: envoy.filters.network.http_connection_manager
31-
typed_config:
32-
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
33-
stat_prefix: reverse_conn_listener
34-
route_config:
35-
virtual_hosts:
36-
- name: backend
37-
domains:
38-
- "*"
39-
routes:
40-
- match:
41-
prefix: '/downstream_service'
42-
route:
43-
cluster: downstream-service
44-
http_filters:
45-
- name: envoy.filters.http.router
46-
typed_config:
47-
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
16+
# Initiates reverse connections to upstream using custom resolver
17+
- name: reverse_conn_listener
18+
listener_filters_timeout: 0s
19+
listener_filters: []
20+
# Use custom address with reverse connection metadata encoded in URL format
21+
address:
22+
socket_address:
23+
# This encodes: src_node_id, src_cluster_id, src_tenant_id
24+
# and remote clusters: upstream-cluster with 1 connection
25+
address: "rc://downstream-node:downstream-cluster:downstream-tenant@upstream-cluster:1"
26+
port_value: 0
27+
# Use custom resolver that can parse reverse connection metadata
28+
resolver_name: "envoy.resolvers.reverse_connection"
29+
filter_chains:
30+
- filters:
31+
- name: envoy.filters.network.http_connection_manager
32+
typed_config:
33+
"@type": >-
34+
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
35+
stat_prefix: reverse_conn_listener
36+
route_config:
37+
virtual_hosts:
38+
- name: backend
39+
domains:
40+
- "*"
41+
routes:
42+
- match:
43+
prefix: '/downstream_service'
44+
route:
45+
cluster: downstream-service
46+
http_filters:
47+
- name: envoy.filters.http.router
48+
typed_config:
49+
"@type": >-
50+
type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
4851
4952
# Cluster designating upstream-envoy
5053
clusters:
51-
- name: upstream-cluster
52-
type: STRICT_DNS
53-
connect_timeout: 30s
54-
load_assignment:
55-
cluster_name: upstream-cluster
56-
endpoints:
57-
- lb_endpoints:
58-
- endpoint:
59-
address:
60-
socket_address:
61-
address: upstream-envoy # Container name of upstream-envoy in docker-compose
62-
port_value: 9000 # Port where upstream-envoy's rev_conn_api_listener listens
54+
- name: upstream-cluster
55+
type: STRICT_DNS
56+
connect_timeout: 30s
57+
load_assignment:
58+
cluster_name: upstream-cluster
59+
endpoints:
60+
- lb_endpoints:
61+
- endpoint:
62+
address:
63+
socket_address:
64+
address: upstream-envoy # Address of upstream-envoy
65+
port_value: 9000 # Port for rev_conn_api_listener
6366

64-
# Backend HTTP service behind downstream which
65-
# we will access via reverse connections
66-
- name: downstream-service
67-
type: STRICT_DNS
68-
connect_timeout: 30s
69-
load_assignment:
70-
cluster_name: downstream-service
71-
endpoints:
72-
- lb_endpoints:
73-
- endpoint:
74-
address:
75-
socket_address:
76-
address: downstream-service
77-
port_value: 80
67+
# Backend HTTP service behind downstream which
68+
# we will access via reverse connections
69+
- name: downstream-service
70+
type: STRICT_DNS
71+
connect_timeout: 30s
72+
load_assignment:
73+
cluster_name: downstream-service
74+
endpoints:
75+
- lb_endpoints:
76+
- endpoint:
77+
address:
78+
socket_address:
79+
address: downstream-service
80+
port_value: 80
7881

7982
admin:
8083
access_log_path: "/dev/stdout"
@@ -88,4 +91,4 @@ layered_runtime:
8891
layers:
8992
- name: layer
9093
static_layer:
91-
re2.max_program_size.error_level: 1000
94+
re2.max_program_size.error_level: 1000

reverse_tunnel/responder-envoy.yaml

Lines changed: 73 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,93 @@
22
node:
33
id: upstream-node
44
cluster: upstream-cluster
5+
6+
# Enable reverse connection bootstrap extension
7+
bootstrap_extensions:
8+
- name: envoy.bootstrap.reverse_tunnel.upstream_socket_interface
9+
typed_config:
10+
"@type": >-
11+
type.googleapis.com/envoy.extensions.bootstrap.reverse_tunnel.upstream_socket_interface.v3.UpstreamReverseConnectionSocketInterface
12+
stat_prefix: "upstream_reverse_connection"
13+
514
static_resources:
615
listeners:
7-
# Accepts reverse tunnel requests
8-
- name: rev_conn_api_listener
9-
address:
10-
socket_address:
11-
address: 0.0.0.0
12-
port_value: 9000
13-
filter_chains:
14-
- filters:
15-
- name: envoy.filters.network.reverse_tunnel
16-
typed_config:
17-
"@type": type.googleapis.com/envoy.extensions.filters.network.reverse_tunnel.v3.ReverseTunnel
18-
ping_interval: 2s
16+
# Accepts reverse tunnel requests
17+
- name: rev_conn_api_listener
18+
address:
19+
socket_address:
20+
address: 0.0.0.0
21+
port_value: 9000
22+
filter_chains:
23+
- filters:
24+
- name: envoy.filters.network.reverse_tunnel
25+
typed_config:
26+
"@type": >-
27+
type.googleapis.com/envoy.extensions.filters.network.reverse_tunnel.v3.ReverseTunnel
28+
ping_interval: 2s
29+
30+
# Listener that will route the downstream request to the reverse connection cluster
31+
- name: egress_listener
32+
address:
33+
socket_address:
34+
address: 0.0.0.0
35+
port_value: 8085
36+
filter_chains:
37+
- filters:
38+
- name: envoy.http_connection_manager
39+
typed_config:
40+
"@type": >-
41+
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
42+
stat_prefix: egress_http
43+
route_config:
44+
virtual_hosts:
45+
- name: backend
46+
domains:
47+
- "*"
48+
routes:
49+
- match:
50+
prefix: "/downstream_service"
51+
route:
52+
cluster: reverse_connection_cluster
53+
http_filters:
54+
- name: envoy.filters.http.router
55+
typed_config:
56+
"@type": >-
57+
type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
1958
20-
# Listener that will route the downstream request to the reverse connection cluster
21-
- name: egress_listener
22-
address:
23-
socket_address:
24-
address: 0.0.0.0
25-
port_value: 8085
26-
filter_chains:
27-
- filters:
28-
- name: envoy.http_connection_manager
29-
typed_config:
30-
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
31-
stat_prefix: egress_http
32-
route_config:
33-
virtual_hosts:
34-
- name: backend
35-
domains:
36-
- "*"
37-
routes:
38-
- match:
39-
prefix: "/downstream_service"
40-
route:
41-
cluster: reverse_connection_cluster
42-
http_filters:
43-
- name: envoy.filters.http.router
44-
typed_config:
45-
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
4659
# Cluster used to write requests to cached sockets
4760
clusters:
48-
- name: reverse_connection_cluster
49-
connect_timeout: 200s
50-
lb_policy: CLUSTER_PROVIDED
51-
cluster_type:
52-
name: envoy.clusters.reverse_connection
53-
typed_config:
54-
"@type": type.googleapis.com/envoy.extensions.clusters.reverse_connection.v3.RevConClusterConfig
55-
# The following headers are expected in downstream requests
56-
# to be sent over reverse connections
57-
http_header_names:
58-
- x-remote-node-id # Should be set to the node ID of the downstream envoy node, ie., downstream-node
59-
- x-dst-cluster-uuid # Should be set to the cluster ID of the downstream envoy node, ie., downstream
60-
typed_extension_protocol_options:
61-
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
62-
"@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
63-
explicit_http_config:
64-
# Right the moment, reverse connections are supported over HTTP/2 only
65-
http2_protocol_options: {}
61+
- name: reverse_connection_cluster
62+
connect_timeout: 200s
63+
lb_policy: CLUSTER_PROVIDED
64+
cluster_type:
65+
name: envoy.clusters.reverse_connection
66+
typed_config:
67+
"@type": >-
68+
type.googleapis.com/envoy.extensions.clusters.reverse_connection.v3.RevConClusterConfig
69+
# The following headers are expected in downstream requests
70+
# to be sent over reverse connections
71+
http_header_names:
72+
- x-remote-node-id # Should be set to downstream-node
73+
- x-dst-cluster-uuid # Should be set to downstream
74+
typed_extension_protocol_options:
75+
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
76+
"@type": >-
77+
type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
78+
explicit_http_config:
79+
# Right the moment, reverse connections are supported over HTTP/2 only
80+
http2_protocol_options: {}
81+
6682
admin:
6783
access_log_path: "/dev/stdout"
6884
address:
6985
socket_address:
7086
address: 0.0.0.0
7187
port_value: 8888
88+
7289
layered_runtime:
7390
layers:
7491
- name: layer
7592
static_layer:
7693
re2.max_program_size.error_level: 1000
7794
envoy.reloadable_features.reverse_conn_force_local_reply: true
78-
# Enable reverse connection bootstrap extension
79-
bootstrap_extensions:
80-
- name: envoy.bootstrap.reverse_tunnel.upstream_socket_interface
81-
typed_config:
82-
"@type": type.googleapis.com/envoy.extensions.bootstrap.reverse_tunnel.upstream_socket_interface.v3.UpstreamReverseConnectionSocketInterface
83-
stat_prefix: "upstream_reverse_connection"

0 commit comments

Comments
 (0)