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]>
tetratelabs · Nov 13, 2020 · c4a44c4 · c4a44c4
1 parent 72ffe0f
commit c4a44c4
Show file tree

Hide file tree

Showing 12 changed files with 249 additions and 168 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -49,7 +49,7 @@ jobs:
   e2e-tests-envoy:
     strategy:
       matrix:
-        envoy-image: [ "envoyproxy/envoy-dev:55538fd04eb4f556aebd2d2e60cc99374e9d73b2" ] # TODO: add release tagged version
+        envoy-image: [ "envoyproxy/envoy-dev:2a252964ecd5e790aaac3a4d08d43bd3cad4b6c8" ] # TODO: add release tagged version
     name: e2e tests on examples
     needs: build-examples
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .DEFAULT_GOAL := build.examples
 
-ISTIO_VERSION ?= 1.7.2
+ISTIO_VERSION ?= 1.7.3
 
 .PHONY: build.example build.example.docker build.examples build.examples.docker lint test test.sdk test.e2e
 

diff --git a/README.md b/README.md
@@ -56,8 +56,8 @@ TinyGo's official tagged release of WASI target will come soon, and after that y
 
 | proxy-wasm-go-sdk| proxy-wasm ABI version |istio/proxyv2| Envoy upstream|
 |:-------------:|:-------------:|:-------------:|:-------------:|
-| main |  0.2.0|   v1.17.x |   [55538fd04eb4f556aebd](https://github.com/envoyproxy/envoy/tree/55538fd04eb4f556aebd2d2e60cc99374e9d73b2) |
-| v0.0.10 |  0.2.0|   v1.17.x | [55538fd04eb4f556aebd](https://github.com/envoyproxy/envoy/tree/55538fd04eb4f556aebd2d2e60cc99374e9d73b2) |
+| main |  0.2.0|   v1.17.x |   [2a252964ecd5e790aaac](https://github.com/envoyproxy/envoy/tree/2a252964ecd5e790aaac3a4d08d43bd3cad4b6c8) |
+| v0.0.11 |  0.2.0|   v1.17.x |[2a252964ecd5e790aaac](https://github.com/envoyproxy/envoy/tree/2a252964ecd5e790aaac3a4d08d43bd3cad4b6c8) |
 
 
 ## run examples

diff --git a/examples/helloworld/envoy.yaml b/examples/helloworld/envoy.yaml
@@ -8,7 +8,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -24,19 +25,22 @@ static_resources:
                             cluster: web_service
                 http_filters:
                   - name: envoy.filters.http.wasm
-                    config:
-                      config:
-                        name: "helloworld"
-                        root_id: "helloworld"
-                        vm_config:
-                          vm_id: "helloworld"
-                          runtime: "envoy.wasm.runtime.v8"
-                          code:
-                            local:
-                              filename: "./examples/helloworld/main.go.wasm"
-                          allow_precompiled: true
-                  - name: envoy.router
-                    config: {}
+                    typed_config:
+                      "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                      type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
+                      value:
+                        config:
+                          name: "helloworld"
+                          root_id: "helloworld"
+                          vm_config:
+                            vm_id: "helloworld"
+                            runtime: "envoy.wasm.runtime.v8"
+                            code:
+                              local:
+                                filename: "./examples/helloworld/main.go.wasm"
+                  - name: envoy.filters.http.router
+                    typed_config: {}
+
     - name: staticreply
       address:
         socket_address:
@@ -45,7 +49,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -62,18 +67,24 @@ static_resources:
                             body:
                               inline_string: "example body\n"
                 http_filters:
-                  - name: envoy.router
-                    config: {}
+                  - name: envoy.filters.http.router
+                    typed_config: {}
 
   clusters:
     - name: web_service
       connect_timeout: 0.25s
-      type: static
-      lb_policy: round_robin
-      hosts:
-        - socket_address:
-            address: 127.0.0.1
-            port_value: 8099
+      type: STATIC
+      lb_policy: ROUND_ROBIN
+      load_assignment:
+        cluster_name: mock_service
+        endpoints:
+          - lb_endpoints:
+              - endpoint:
+                  address:
+                    socket_address:
+                      address: 127.0.0.1
+                      port_value: 8099
+
 admin:
   access_log_path: "/dev/null"
   address:

diff --git a/examples/http_auth_random/envoy.yaml b/examples/http_auth_random/envoy.yaml
@@ -8,7 +8,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -24,23 +25,26 @@ static_resources:
                             cluster: httpbin
                 http_filters:
                   - name: envoy.filters.http.wasm
-                    config:
-                      config:
-                        name: "my_plugin"
-                        root_id: "my_root_id"
-                        vm_config:
-                          vm_id: "my_vm_id"
-                          runtime: "envoy.wasm.runtime.v8"
-                          code:
-                            local:
-                              filename: "./examples/http_auth_random/main.go.wasm"
-                          allow_precompiled: true
-                  - name: envoy.router
-                    config: {}
+                    typed_config:
+                      "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                      type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
+                      value:
+                        config:
+                          name: "my_plugin"
+                          root_id: "my_root_id"
+                          vm_config:
+                            vm_id: "my_vm_id"
+                            runtime: "envoy.wasm.runtime.v8"
+                            code:
+                              local:
+                                filename: "./examples/http_auth_random/main.go.wasm"
+                            allow_precompiled: true
+                  - name: envoy.filters.http.router
+                    typed_config: {}
 
   clusters:
     - name: httpbin
-      connect_timeout: 1000s
+      connect_timeout: 5000s
       type: strict_dns
       lb_policy: round_robin
       load_assignment:

diff --git a/examples/http_body/envoy.yaml b/examples/http_body/envoy.yaml
@@ -8,7 +8,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -24,23 +25,26 @@ static_resources:
                             cluster: httpbin
                 http_filters:
                   - name: envoy.filters.http.wasm
-                    config:
-                      config:
-                        name: "my_plugin"
-                        root_id: "my_root_id"
-                        vm_config:
-                          vm_id: "my_vm_id"
-                          runtime: "envoy.wasm.runtime.v8"
-                          code:
-                            local:
-                              filename: "./examples/http_body/main.go.wasm"
-                          allow_precompiled: true
-                  - name: envoy.router
-                    config: {}
+                    typed_config:
+                      "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                      type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
+                      value:
+                        config:
+                          name: "my_plugin"
+                          root_id: "my_root_id"
+                          vm_config:
+                            vm_id: "my_vm_id"
+                            runtime: "envoy.wasm.runtime.v8"
+                            code:
+                              local:
+                                filename: "./examples/http_body/main.go.wasm"
+                            allow_precompiled: true
+                  - name: envoy.filters.http.router
+                    typed_config: {}
 
   clusters:
     - name: httpbin
-      connect_timeout: 1000s
+      connect_timeout: 5000s
       type: strict_dns
       lb_policy: round_robin
       load_assignment:

diff --git a/examples/http_headers/envoy.yaml b/examples/http_headers/envoy.yaml
@@ -8,7 +8,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -24,19 +25,23 @@ static_resources:
                             cluster: web_service
                 http_filters:
                   - name: envoy.filters.http.wasm
-                    config:
-                      config:
-                        name: "my_plugin"
-                        root_id: "my_root_id"
-                        vm_config:
-                          vm_id: "my_vm_id"
-                          runtime: "envoy.wasm.runtime.v8"
-                          code:
-                            local:
-                              filename: "./examples/http_headers/main.go.wasm"
-                          allow_precompiled: true
-                  - name: envoy.router
-                    config: {}
+                    typed_config:
+                      "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                      type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
+                      value:
+                        config:
+                          name: "my_plugin"
+                          root_id: "my_root_id"
+                          vm_config:
+                            vm_id: "my_vm_id"
+                            runtime: "envoy.wasm.runtime.v8"
+                            code:
+                              local:
+                                filename: "./examples/http_headers/main.go.wasm"
+                            allow_precompiled: true
+                  - name: envoy.filters.http.router
+                    typed_config: {}
+
     - name: staticreply
       address:
         socket_address:
@@ -45,7 +50,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -62,18 +68,24 @@ static_resources:
                             body:
                               inline_string: "example body\n"
                 http_filters:
-                  - name: envoy.router
-                    config: {}
+                  - name: envoy.filters.http.router
+                    typed_config: {}
 
   clusters:
     - name: web_service
       connect_timeout: 0.25s
-      type: static
-      lb_policy: round_robin
-      hosts:
-        - socket_address:
-            address: 127.0.0.1
-            port_value: 8099
+      type: STATIC
+      lb_policy: ROUND_ROBIN
+      load_assignment:
+        cluster_name: mock_service
+        endpoints:
+          - lb_endpoints:
+              - endpoint:
+                  address:
+                    socket_address:
+                      address: 127.0.0.1
+                      port_value: 8099
+
 admin:
   access_log_path: "/dev/null"
   address:

diff --git a/examples/metrics/envoy.yaml b/examples/metrics/envoy.yaml
@@ -8,7 +8,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -24,19 +25,23 @@ static_resources:
                             cluster: web_service
                 http_filters:
                   - name: envoy.filters.http.wasm
-                    config:
-                      config:
-                        name: "my_plugin"
-                        root_id: "my_root_id"
-                        vm_config:
-                          vm_id: "my_vm_id"
-                          runtime: "envoy.wasm.runtime.v8"
-                          code:
-                            local:
-                              filename: "./examples/metrics/main.go.wasm"
-                          allow_precompiled: true
-                  - name: envoy.router
-                    config: {}
+                    typed_config:
+                      "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                      type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm
+                      value:
+                        config:
+                          name: "my_plugin"
+                          root_id: "my_root_id"
+                          vm_config:
+                            vm_id: "my_vm_id"
+                            runtime: "envoy.wasm.runtime.v8"
+                            code:
+                              local:
+                                filename: "./examples/metrics/main.go.wasm"
+                            allow_precompiled: true
+                  - name: envoy.filters.http.router
+                    typed_config: {}
+
     - name: staticreply
       address:
         socket_address:
@@ -45,7 +50,8 @@ static_resources:
       filter_chains:
         - filters:
             - name: envoy.http_connection_manager
-              config:
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                 stat_prefix: ingress_http
                 codec_type: auto
                 route_config:
@@ -62,18 +68,24 @@ static_resources:
                             body:
                               inline_string: "example body\n"
                 http_filters:
-                  - name: envoy.router
-                    config: {}
+                  - name: envoy.filters.http.router
+                    typed_config: {}
 
   clusters:
     - name: web_service
       connect_timeout: 0.25s
-      type: static
-      lb_policy: round_robin
-      hosts:
-        - socket_address:
-            address: 127.0.0.1
-            port_value: 8099
+      type: STATIC
+      lb_policy: ROUND_ROBIN
+      load_assignment:
+        cluster_name: mock_service
+        endpoints:
+          - lb_endpoints:
+              - endpoint:
+                  address:
+                    socket_address:
+                      address: 127.0.0.1
+                      port_value: 8099
+
 admin:
   access_log_path: "/dev/null"
   address: