Skip to content
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.

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

tried to upgrade docker.io/envoyproxy/envoy #1449

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion docker-compose-testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- ./docker/genesis-testnet.json:/genesis.json:z
- ./docker/oasis-explorer/config-testnet.json:/.secrets/config.json:z
envoy:
image: docker.io/envoyproxy/envoy:v1.21.3
image: docker.io/envoyproxy/envoy:v1.22.11
ports:
- '127.0.0.1:42280:42280'
- '127.0.0.1:42281:42281'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
- ./docker/genesis-local.json:/genesis.json:z
- ./docker/oasis-explorer/config-local.json:/.secrets/config.json:z
envoy:
image: docker.io/envoyproxy/envoy:v1.21.3
image: docker.io/envoyproxy/envoy:v1.22.11
ports:
- '42280:42280'
- '42281:42281'
Expand Down
13 changes: 8 additions & 5 deletions docker/envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ static_resources:
routes:
- match:
safe_regex:
google_re2:
max_program_size: 1000000
regex: '/oasis-core\.(NodeController/WaitReady|Registry/(GetNodes)|Staking/(TokenSymbol|ConsensusParameters|Account|DelegationsTo|DelegationsFor|DelegationInfosFor|DebondingDelegationInfosFor|GetEvents)|Beacon/(GetEpoch)|Consensus/(SubmitTx|EstimateGas|GetBlock|GetChainContext|GetTransactionsWithResults|GetGenesisDocument|WatchBlocks|GetSignerNonce))'
route:
cluster: oasis_node_grpc
Expand All @@ -38,15 +36,21 @@ static_resources:
route:
cluster: dev_static
cors:
expose_headers: grpc-status,grpc-message
allow_origin_string_match:
- prefix: '*'
- exact: '*'
allow_headers: content-type,x-grpc-web,x-user-agent
expose_headers: grpc-status,grpc-message,grpc-status-details-bin
max_age: '1728000'
http_filters:
- name: envoy.filters.http.grpc_web
typed_config:
'@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
- name: envoy.filters.http.cors
typed_config:
'@type': type.googleapis.com/envoy.extensions.filters.http.cors.v3.Cors
- name: envoy.filters.http.router
typed_config:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
clusters:
- name: oasis_node_grpc
connect_timeout: 15s
Expand All @@ -58,7 +62,6 @@ static_resources:
address:
pipe:
path: /node/data/internal.sock
http2_protocol_options: {}
- name: dev_static
connect_timeout: 0.25s
load_assignment:
Expand Down