Skip to content
This repository was archived by the owner on Apr 24, 2025. It is now read-only.

Commit c4a44c4

Browse files
mathetakemathetake
authored
update upstream envoy on ci (#94)
* update upstream envoy on ci Signed-off-by: mathetake <[email protected]> * update example config Signed-off-by: mathetake <[email protected]> * update readme Signed-off-by: mathetake <[email protected]>
1 parent 72ffe0f commit c4a44c4

File tree

12 files changed

+249
-168
lines changed

12 files changed

+249
-168
lines changed

‎.github/workflows/workflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
e2e-tests-envoy:
5050
strategy:
5151
matrix:
52-
envoy-image: [ "envoyproxy/envoy-dev:55538fd04eb4f556aebd2d2e60cc99374e9d73b2" ] # TODO: add release tagged version
52+
envoy-image: [ "envoyproxy/envoy-dev:2a252964ecd5e790aaac3a4d08d43bd3cad4b6c8" ] # TODO: add release tagged version
5353
name: e2e tests on examples
5454
needs: build-examples
5555
runs-on: ubuntu-latest

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.DEFAULT_GOAL := build.examples
22

3-
ISTIO_VERSION ?= 1.7.2
3+
ISTIO_VERSION ?= 1.7.3
44

55
.PHONY: build.example build.example.docker build.examples build.examples.docker lint test test.sdk test.e2e
66

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ TinyGo's official tagged release of WASI target will come soon, and after that y
5656

5757
| proxy-wasm-go-sdk| proxy-wasm ABI version |istio/proxyv2| Envoy upstream|
5858
|:-------------:|:-------------:|:-------------:|:-------------:|
59-
| main | 0.2.0| v1.17.x | [55538fd04eb4f556aebd](https://github.com/envoyproxy/envoy/tree/55538fd04eb4f556aebd2d2e60cc99374e9d73b2) |
60-
| v0.0.10 | 0.2.0| v1.17.x | [55538fd04eb4f556aebd](https://github.com/envoyproxy/envoy/tree/55538fd04eb4f556aebd2d2e60cc99374e9d73b2) |
59+
| main | 0.2.0| v1.17.x | [2a252964ecd5e790aaac](https://github.com/envoyproxy/envoy/tree/2a252964ecd5e790aaac3a4d08d43bd3cad4b6c8) |
60+
| v0.0.11 | 0.2.0| v1.17.x |[2a252964ecd5e790aaac](https://github.com/envoyproxy/envoy/tree/2a252964ecd5e790aaac3a4d08d43bd3cad4b6c8) |
6161

6262

6363
## run examples

‎examples/helloworld/envoy.yaml

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ static_resources:
88
filter_chains:
99
- filters:
1010
- name: envoy.http_connection_manager
11-
config:
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
1213
stat_prefix: ingress_http
1314
codec_type: auto
1415
route_config:
@@ -24,19 +25,22 @@ static_resources:
2425
cluster: web_service
2526
http_filters:
2627
- name: envoy.filters.http.wasm
27-
config:
28-
config:
29-
name: "helloworld"
30-
root_id: "helloworld"
31-
vm_config:
32-
vm_id: "helloworld"
33-
runtime: "envoy.wasm.runtime.v8"
34-
code:
35-
local:
36-
filename: "./examples/helloworld/main.go.wasm"
37-
allow_precompiled: true
38-
- name: envoy.router
39-
config: {}
28+
typed_config:
29+
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
30+
type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
31+
value:
32+
config:
33+
name: "helloworld"
34+
root_id: "helloworld"
35+
vm_config:
36+
vm_id: "helloworld"
37+
runtime: "envoy.wasm.runtime.v8"
38+
code:
39+
local:
40+
filename: "./examples/helloworld/main.go.wasm"
41+
- name: envoy.filters.http.router
42+
typed_config: {}
43+
4044
- name: staticreply
4145
address:
4246
socket_address:
@@ -45,7 +49,8 @@ static_resources:
4549
filter_chains:
4650
- filters:
4751
- name: envoy.http_connection_manager
48-
config:
52+
typed_config:
53+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
4954
stat_prefix: ingress_http
5055
codec_type: auto
5156
route_config:
@@ -62,18 +67,24 @@ static_resources:
6267
body:
6368
inline_string: "example body\n"
6469
http_filters:
65-
- name: envoy.router
66-
config: {}
70+
- name: envoy.filters.http.router
71+
typed_config: {}
6772

6873
clusters:
6974
- name: web_service
7075
connect_timeout: 0.25s
71-
type: static
72-
lb_policy: round_robin
73-
hosts:
74-
- socket_address:
75-
address: 127.0.0.1
76-
port_value: 8099
76+
type: STATIC
77+
lb_policy: ROUND_ROBIN
78+
load_assignment:
79+
cluster_name: mock_service
80+
endpoints:
81+
- lb_endpoints:
82+
- endpoint:
83+
address:
84+
socket_address:
85+
address: 127.0.0.1
86+
port_value: 8099
87+
7788
admin:
7889
access_log_path: "/dev/null"
7990
address:

‎examples/http_auth_random/envoy.yaml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ static_resources:
88
filter_chains:
99
- filters:
1010
- name: envoy.http_connection_manager
11-
config:
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
1213
stat_prefix: ingress_http
1314
codec_type: auto
1415
route_config:
@@ -24,23 +25,26 @@ static_resources:
2425
cluster: httpbin
2526
http_filters:
2627
- name: envoy.filters.http.wasm
27-
config:
28-
config:
29-
name: "my_plugin"
30-
root_id: "my_root_id"
31-
vm_config:
32-
vm_id: "my_vm_id"
33-
runtime: "envoy.wasm.runtime.v8"
34-
code:
35-
local:
36-
filename: "./examples/http_auth_random/main.go.wasm"
37-
allow_precompiled: true
38-
- name: envoy.router
39-
config: {}
28+
typed_config:
29+
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
30+
type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
31+
value:
32+
config:
33+
name: "my_plugin"
34+
root_id: "my_root_id"
35+
vm_config:
36+
vm_id: "my_vm_id"
37+
runtime: "envoy.wasm.runtime.v8"
38+
code:
39+
local:
40+
filename: "./examples/http_auth_random/main.go.wasm"
41+
allow_precompiled: true
42+
- name: envoy.filters.http.router
43+
typed_config: {}
4044

4145
clusters:
4246
- name: httpbin
43-
connect_timeout: 1000s
47+
connect_timeout: 5000s
4448
type: strict_dns
4549
lb_policy: round_robin
4650
load_assignment:

‎examples/http_body/envoy.yaml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ static_resources:
88
filter_chains:
99
- filters:
1010
- name: envoy.http_connection_manager
11-
config:
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
1213
stat_prefix: ingress_http
1314
codec_type: auto
1415
route_config:
@@ -24,23 +25,26 @@ static_resources:
2425
cluster: httpbin
2526
http_filters:
2627
- name: envoy.filters.http.wasm
27-
config:
28-
config:
29-
name: "my_plugin"
30-
root_id: "my_root_id"
31-
vm_config:
32-
vm_id: "my_vm_id"
33-
runtime: "envoy.wasm.runtime.v8"
34-
code:
35-
local:
36-
filename: "./examples/http_body/main.go.wasm"
37-
allow_precompiled: true
38-
- name: envoy.router
39-
config: {}
28+
typed_config:
29+
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
30+
type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
31+
value:
32+
config:
33+
name: "my_plugin"
34+
root_id: "my_root_id"
35+
vm_config:
36+
vm_id: "my_vm_id"
37+
runtime: "envoy.wasm.runtime.v8"
38+
code:
39+
local:
40+
filename: "./examples/http_body/main.go.wasm"
41+
allow_precompiled: true
42+
- name: envoy.filters.http.router
43+
typed_config: {}
4044

4145
clusters:
4246
- name: httpbin
43-
connect_timeout: 1000s
47+
connect_timeout: 5000s
4448
type: strict_dns
4549
lb_policy: round_robin
4650
load_assignment:

‎examples/http_headers/envoy.yaml

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ static_resources:
88
filter_chains:
99
- filters:
1010
- name: envoy.http_connection_manager
11-
config:
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
1213
stat_prefix: ingress_http
1314
codec_type: auto
1415
route_config:
@@ -24,19 +25,23 @@ static_resources:
2425
cluster: web_service
2526
http_filters:
2627
- name: envoy.filters.http.wasm
27-
config:
28-
config:
29-
name: "my_plugin"
30-
root_id: "my_root_id"
31-
vm_config:
32-
vm_id: "my_vm_id"
33-
runtime: "envoy.wasm.runtime.v8"
34-
code:
35-
local:
36-
filename: "./examples/http_headers/main.go.wasm"
37-
allow_precompiled: true
38-
- name: envoy.router
39-
config: {}
28+
typed_config:
29+
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
30+
type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
31+
value:
32+
config:
33+
name: "my_plugin"
34+
root_id: "my_root_id"
35+
vm_config:
36+
vm_id: "my_vm_id"
37+
runtime: "envoy.wasm.runtime.v8"
38+
code:
39+
local:
40+
filename: "./examples/http_headers/main.go.wasm"
41+
allow_precompiled: true
42+
- name: envoy.filters.http.router
43+
typed_config: {}
44+
4045
- name: staticreply
4146
address:
4247
socket_address:
@@ -45,7 +50,8 @@ static_resources:
4550
filter_chains:
4651
- filters:
4752
- name: envoy.http_connection_manager
48-
config:
53+
typed_config:
54+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
4955
stat_prefix: ingress_http
5056
codec_type: auto
5157
route_config:
@@ -62,18 +68,24 @@ static_resources:
6268
body:
6369
inline_string: "example body\n"
6470
http_filters:
65-
- name: envoy.router
66-
config: {}
71+
- name: envoy.filters.http.router
72+
typed_config: {}
6773

6874
clusters:
6975
- name: web_service
7076
connect_timeout: 0.25s
71-
type: static
72-
lb_policy: round_robin
73-
hosts:
74-
- socket_address:
75-
address: 127.0.0.1
76-
port_value: 8099
77+
type: STATIC
78+
lb_policy: ROUND_ROBIN
79+
load_assignment:
80+
cluster_name: mock_service
81+
endpoints:
82+
- lb_endpoints:
83+
- endpoint:
84+
address:
85+
socket_address:
86+
address: 127.0.0.1
87+
port_value: 8099
88+
7789
admin:
7890
access_log_path: "/dev/null"
7991
address:

‎examples/metrics/envoy.yaml

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ static_resources:
88
filter_chains:
99
- filters:
1010
- name: envoy.http_connection_manager
11-
config:
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
1213
stat_prefix: ingress_http
1314
codec_type: auto
1415
route_config:
@@ -24,19 +25,23 @@ static_resources:
2425
cluster: web_service
2526
http_filters:
2627
- name: envoy.filters.http.wasm
27-
config:
28-
config:
29-
name: "my_plugin"
30-
root_id: "my_root_id"
31-
vm_config:
32-
vm_id: "my_vm_id"
33-
runtime: "envoy.wasm.runtime.v8"
34-
code:
35-
local:
36-
filename: "./examples/metrics/main.go.wasm"
37-
allow_precompiled: true
38-
- name: envoy.router
39-
config: {}
28+
typed_config:
29+
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
30+
type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
31+
value:
32+
config:
33+
name: "my_plugin"
34+
root_id: "my_root_id"
35+
vm_config:
36+
vm_id: "my_vm_id"
37+
runtime: "envoy.wasm.runtime.v8"
38+
code:
39+
local:
40+
filename: "./examples/metrics/main.go.wasm"
41+
allow_precompiled: true
42+
- name: envoy.filters.http.router
43+
typed_config: {}
44+
4045
- name: staticreply
4146
address:
4247
socket_address:
@@ -45,7 +50,8 @@ static_resources:
4550
filter_chains:
4651
- filters:
4752
- name: envoy.http_connection_manager
48-
config:
53+
typed_config:
54+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
4955
stat_prefix: ingress_http
5056
codec_type: auto
5157
route_config:
@@ -62,18 +68,24 @@ static_resources:
6268
body:
6369
inline_string: "example body\n"
6470
http_filters:
65-
- name: envoy.router
66-
config: {}
71+
- name: envoy.filters.http.router
72+
typed_config: {}
6773

6874
clusters:
6975
- name: web_service
7076
connect_timeout: 0.25s
71-
type: static
72-
lb_policy: round_robin
73-
hosts:
74-
- socket_address:
75-
address: 127.0.0.1
76-
port_value: 8099
77+
type: STATIC
78+
lb_policy: ROUND_ROBIN
79+
load_assignment:
80+
cluster_name: mock_service
81+
endpoints:
82+
- lb_endpoints:
83+
- endpoint:
84+
address:
85+
socket_address:
86+
address: 127.0.0.1
87+
port_value: 8099
88+
7789
admin:
7890
access_log_path: "/dev/null"
7991
address:

0 commit comments

Comments
 (0)