Skip to content

Commit daf7cc8

Browse files
dmaixnerstanley-cheung
authored andcommitted
[fix] envoy deprecated fields
This gets rid of warnings in envoy log files for deprecated fields.
1 parent c9b2e34 commit daf7cc8

File tree

3 files changed

+45
-18
lines changed

3 files changed

+45
-18
lines changed

net/grpc/gateway/examples/echo/envoy.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ static_resources:
1010
socket_address: { address: 0.0.0.0, port_value: 8080 }
1111
filter_chains:
1212
- filters:
13-
- name: envoy.http_connection_manager
14-
config:
13+
- name: envoy.filters.network.http_connection_manager
14+
typed_config:
15+
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
1516
codec_type: auto
1617
stat_prefix: ingress_http
1718
route_config:
@@ -32,13 +33,21 @@ static_resources:
3233
max_age: "1728000"
3334
expose_headers: custom-header-1,grpc-status,grpc-message
3435
http_filters:
35-
- name: envoy.grpc_web
36-
- name: envoy.cors
37-
- name: envoy.router
36+
- name: envoy.filters.http.grpc_web
37+
- name: envoy.filters.http.cors
38+
- name: envoy.filters.http.router
3839
clusters:
3940
- name: echo_service
4041
connect_timeout: 0.25s
4142
type: logical_dns
4243
http2_protocol_options: {}
4344
lb_policy: round_robin
44-
hosts: [{ socket_address: { address: node-server, port_value: 9090 }}]
45+
load_assignment:
46+
cluster_name: cluster_0
47+
endpoints:
48+
- lb_endpoints:
49+
- endpoint:
50+
address:
51+
socket_address:
52+
address: node-server
53+
port_value: 9090

net/grpc/gateway/examples/helloworld/envoy.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ static_resources:
1010
socket_address: { address: 0.0.0.0, port_value: 8080 }
1111
filter_chains:
1212
- filters:
13-
- name: envoy.http_connection_manager
14-
config:
13+
- name: envoy.filters.network.http_connection_manager
14+
typed_config:
15+
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
1516
codec_type: auto
1617
stat_prefix: ingress_http
1718
route_config:
@@ -32,14 +33,22 @@ static_resources:
3233
max_age: "1728000"
3334
expose_headers: custom-header-1,grpc-status,grpc-message
3435
http_filters:
35-
- name: envoy.grpc_web
36-
- name: envoy.cors
37-
- name: envoy.router
36+
- name: envoy.filters.http.grpc_web
37+
- name: envoy.filters.http.cors
38+
- name: envoy.filters.http.router
3839
clusters:
3940
- name: greeter_service
4041
connect_timeout: 0.25s
4142
type: logical_dns
4243
http2_protocol_options: {}
4344
lb_policy: round_robin
4445
# win/mac hosts: Use address: host.docker.internal instead of address: localhost in the line below
45-
hosts: [{ socket_address: { address: 0.0.0.0, port_value: 9090 }}]
46+
load_assignment:
47+
cluster_name: cluster_0
48+
endpoints:
49+
- lb_endpoints:
50+
- endpoint:
51+
address:
52+
socket_address:
53+
address: 0.0.0.0
54+
port_value: 9090

test/interop/envoy.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ static_resources:
1010
socket_address: { address: 0.0.0.0, port_value: 8080 }
1111
filter_chains:
1212
- filters:
13-
- name: envoy.http_connection_manager
14-
config:
13+
- name: envoy.filters.network.http_connection_manager
14+
typed_config:
15+
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
1516
codec_type: auto
1617
stat_prefix: ingress_http
1718
route_config:
@@ -32,13 +33,21 @@ static_resources:
3233
max_age: "1728000"
3334
expose_headers: x-grpc-test-echo-initial,x-grpc-test-echo-trailing-bin,grpc-status,grpc-message
3435
http_filters:
35-
- name: envoy.grpc_web
36-
- name: envoy.cors
37-
- name: envoy.router
36+
- name: envoy.filters.http.grpc_web
37+
- name: envoy.filters.http.cors
38+
- name: envoy.filters.http.router
3839
clusters:
3940
- name: interop_service
4041
connect_timeout: 0.25s
4142
type: logical_dns
4243
http2_protocol_options: {}
4344
lb_policy: round_robin
44-
hosts: [{ socket_address: { address: localhost, port_value: 7074 }}]
45+
load_assignment:
46+
cluster_name: cluster_0
47+
endpoints:
48+
- lb_endpoints:
49+
- endpoint:
50+
address:
51+
socket_address:
52+
address: localhost
53+
port_value: 7074

0 commit comments

Comments
 (0)