Skip to content

Commit a1d2a65

Browse files
authored
V1.16.0 wasm pr (#83)
* wasm * fixed comment * changelog * :(
1 parent a2c390b commit a1d2a65

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

bazel/extensions/extensions_build_config.bzl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ EXTENSIONS = {
77
"envoy.access_loggers.file": "//source/extensions/access_loggers/file:config",
88
"envoy.access_loggers.http_grpc": "//source/extensions/access_loggers/grpc:http_config",
99
"envoy.access_loggers.tcp_grpc": "//source/extensions/access_loggers/grpc:tcp_config",
10+
"envoy.access_loggers.wasm": "//source/extensions/access_loggers/wasm:config",
1011

1112
#
1213
# Clusters
@@ -30,6 +31,11 @@ EXTENSIONS = {
3031
"envoy.grpc_credentials.file_based_metadata": "//source/extensions/grpc_credentials/file_based_metadata:config",
3132
"envoy.grpc_credentials.aws_iam": "//source/extensions/grpc_credentials/aws_iam:config",
3233

34+
#
35+
# WASM
36+
#
37+
"envoy.bootstrap.wasm": "//source/extensions/bootstrap/wasm:config",
38+
3339
#
3440
# Health checkers
3541
#
@@ -73,6 +79,7 @@ EXTENSIONS = {
7379
"envoy.filters.http.router": "//source/extensions/filters/http/router:config",
7480
"envoy.filters.http.squash": "//source/extensions/filters/http/squash:config",
7581
"envoy.filters.http.tap": "//source/extensions/filters/http/tap:config",
82+
"envoy.filters.http.wasm": "//source/extensions/filters/http/wasm:config",
7683

7784
#
7885
# Listener filters
@@ -112,6 +119,7 @@ EXTENSIONS = {
112119
"envoy.filters.network.thrift_proxy": "//source/extensions/filters/network/thrift_proxy:config",
113120
"envoy.filters.network.sni_cluster": "//source/extensions/filters/network/sni_cluster:config",
114121
"envoy.filters.network.sni_dynamic_forward_proxy": "//source/extensions/filters/network/sni_dynamic_forward_proxy:config",
122+
"envoy.filters.network.wasm": "//source/extensions/filters/network/wasm:config",
115123
"envoy.filters.network.zookeeper_proxy": "//source/extensions/filters/network/zookeeper_proxy:config",
116124

117125
#
@@ -136,6 +144,7 @@ EXTENSIONS = {
136144
"envoy.stat_sinks.hystrix": "//source/extensions/stat_sinks/hystrix:config",
137145
"envoy.stat_sinks.metrics_service": "//source/extensions/stat_sinks/metrics_service:config",
138146
"envoy.stat_sinks.statsd": "//source/extensions/stat_sinks/statsd:config",
147+
"envoy.stat_sinks.wasm": "//source/extensions/stat_sinks/wasm:config",
139148

140149
#
141150
# Thrift filters
@@ -164,7 +173,7 @@ EXTENSIONS = {
164173
"envoy.transport_sockets.upstream_proxy_protocol": "//source/extensions/transport_sockets/proxy_protocol:upstream_proxy_protocol",
165174
"envoy.transport_sockets.raw_buffer": "//source/extensions/transport_sockets/raw_buffer:config",
166175
"envoy.transport_sockets.tap": "//source/extensions/transport_sockets/tap:config",
167-
"envoy.transport_sockets.quic": "//source/extensions/quic_listeners/quiche:quic_factory_lib",
176+
"envoy.transport_sockets.quic": "//source/extensions/quic_listeners/quiche:quic_transport_socket_factory_lib",
168177

169178
#
170179
# Retry host predicates

bazel/repository_locations.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
REPOSITORY_LOCATIONS = dict(
2-
# envoy master-v1.16.0 pre-release
2+
# envoy-wasm master-v1.16.0 pre-release
33
envoy = dict(
4-
commit = "862cc5de037bf0930b8251c5d9a2dc2d63844950",
5-
remote = "https://github.com/envoyproxy/envoy",
4+
commit = "7901e9e63b74d95230a719b4f883510a7f539428",
5+
remote = "https://github.com/envoyproxy/envoy-wasm",
66
),
77
inja = dict(
88
commit = "4c0ee3a46c0bbb279b0849e5a659e52684a37a98",
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
changelog:
2+
- type: DEPENDENCY_BUMP
3+
description: Update to latest version of envoy-wasm
4+
dependencyOwner: envoyproxy
5+
dependencyRepo: envoy-wasm
6+
dependencyTag: 7901e9e63b74d95230a719b4f883510a7f539428

ci/do_ci.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ cp -f $UPSTREAM_ENVOY_SRCDIR/.bazelversion $SOURCE_DIR/.bazelversion
1212
# cp -f $UPSTREAM_ENVOY_SRCDIR/bazel/get_workspace_status $SOURCE_DIR/bazel/get_workspace_status
1313
cp -f $UPSTREAM_ENVOY_SRCDIR/ci/WORKSPACE.filter.example $SOURCE_DIR/ci/
1414

15-
mkdir -p $SOURCE_DIR/ci/flaky_test
16-
cp -a $UPSTREAM_ENVOY_SRCDIR/ci/flaky_test $SOURCE_DIR/ci
15+
# mkdir -p $SOURCE_DIR/ci/flaky_test
16+
# cp -a $UPSTREAM_ENVOY_SRCDIR/ci/flaky_test $SOURCE_DIR/ci
1717

18-
cp -f $UPSTREAM_ENVOY_SRCDIR/tools/shell_utils.sh $SOURCE_DIR/tools
18+
# cp -f $UPSTREAM_ENVOY_SRCDIR/tools/shell_utils.sh $SOURCE_DIR/tools
1919

2020

2121

0 commit comments

Comments
 (0)