From e32bf3b02c0c1e6395636e4d6f6a8fa8ba621372 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Tue, 29 Jul 2025 02:02:38 +0900 Subject: [PATCH 1/4] Updates Envoy to v1.35 Signed-off-by: Takeshi Yoneda --- Dockerfile | 2 +- ENVOY_VERSION | 2 +- README.md | 4 ++-- go/gosdk/abi.go | 4 ++-- rust/Cargo.lock | 2 +- rust/Cargo.toml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e01cfa..29bd14e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so . ##### Build the final image ##### -FROM envoyproxy/envoy-dev:73fe00fc139fd5053f4c4a5d66569cc254449896 AS envoy +FROM envoyproxy/envoy-dev:84305a6cb64bd55aaf606bdd53de7cd6080427a1 AS envoy ARG TARGETARCH ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so diff --git a/ENVOY_VERSION b/ENVOY_VERSION index 1fd1531..83af2a2 100644 --- a/ENVOY_VERSION +++ b/ENVOY_VERSION @@ -1 +1 @@ -73fe00fc139fd5053f4c4a5d66569cc254449896 \ No newline at end of file +84305a6cb64bd55aaf606bdd53de7cd6080427a1 \ No newline at end of file diff --git a/README.md b/README.md index 3530ea0..1f16d39 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dynamic Modules Examples -> Envoy Version: [73fe00fc139fd5053f4c4a5d66569cc254449896] v1.35-dev +> Envoy Version: [84305a6cb64bd55aaf606bdd53de7cd6080427a1] v1.35 > > Since dynamic modules are tied with a specific Envoy version, this repository is based on the specific commit of Envoy. > For examples for a specific Envoy version, please check out `release/v` branch, e.g. [`release/v1.34`](https://github.com/envoyproxy/dynamic-modules-examples/tree/release/v1.34). @@ -87,6 +87,6 @@ If you want to explicitly specify the docker image, use `ENVOY_IMAGE` environmen ENVOY_IMAGE=foo-bar-image:latest go test . -v -count=1 ``` -[73fe00fc139fd5053f4c4a5d66569cc254449896]: https://github.com/envoyproxy/envoy/tree/73fe00fc139fd5053f4c4a5d66569cc254449896 +[84305a6cb64bd55aaf606bdd53de7cd6080427a1]: https://github.com/envoyproxy/envoy/tree/84305a6cb64bd55aaf606bdd53de7cd6080427a1 [Envoy]: https://github.com/envoyproxy/envoy [High Level Doc]: https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/dynamic_modules diff --git a/go/gosdk/abi.go b/go/gosdk/abi.go index e009330..fe33a2f 100644 --- a/go/gosdk/abi.go +++ b/go/gosdk/abi.go @@ -3,7 +3,7 @@ package gosdk // Following is a distillation of the Envoy ABI for dynamic modules: -// https://github.com/envoyproxy/envoy/blob/73fe00fc139fd5053f4c4a5d66569cc254449896/source/extensions/dynamic_modules/abi.h +// https://github.com/envoyproxy/envoy/blob/84305a6cb64bd55aaf606bdd53de7cd6080427a1/source/extensions/dynamic_modules/abi.h // // Why not using the header file directly? That is because Go runtime complains // about passing pointers to C code on the boundary. In the following code, we replace @@ -161,7 +161,7 @@ import ( "unsafe" ) -// https://github.com/envoyproxy/envoy/blob/73fe00fc139fd5053f4c4a5d66569cc254449896/source/extensions/dynamic_modules/abi_version.h +// https://github.com/envoyproxy/envoy/blob/84305a6cb64bd55aaf606bdd53de7cd6080427a1/source/extensions/dynamic_modules/abi_version.h var version = append([]byte("cb17cd829c177bc6b75a920283a3347b90d5aaa4d5e723eaa33bad31c8c5b9a9"), 0) //export envoy_dynamic_module_on_program_init diff --git a/rust/Cargo.lock b/rust/Cargo.lock index eee3742..85e9d6f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -84,7 +84,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "envoy-proxy-dynamic-modules-rust-sdk" version = "0.1.0" -source = "git+https://github.com/envoyproxy/envoy?rev=73fe00fc139fd5053f4c4a5d66569cc254449896#73fe00fc139fd5053f4c4a5d66569cc254449896" +source = "git+https://github.com/envoyproxy/envoy?rev=84305a6cb64bd55aaf606bdd53de7cd6080427a1#84305a6cb64bd55aaf606bdd53de7cd6080427a1" dependencies = [ "bindgen", "mockall", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 1f75961..4453050 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/envoyproxy/dynamic-modules-example" [dependencies] # The SDK version must match the Envoy version due to the strict compatibility requirements. -envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "73fe00fc139fd5053f4c4a5d66569cc254449896" } +envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "84305a6cb64bd55aaf606bdd53de7cd6080427a1" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" rand = "0.9.0" From 19ad0f8f99fa14713d892d92c6794dca1a8862e7 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Tue, 29 Jul 2025 02:05:28 +0900 Subject: [PATCH 2/4] more Signed-off-by: Takeshi Yoneda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 29bd14e..bfb80e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so . ##### Build the final image ##### -FROM envoyproxy/envoy-dev:84305a6cb64bd55aaf606bdd53de7cd6080427a1 AS envoy +FROM envoyproxy/envoy:v1.35 AS envoy ARG TARGETARCH ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so From 2a3b5a0e9cca65665b2058f55620d33a52ba7450 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Tue, 29 Jul 2025 02:05:43 +0900 Subject: [PATCH 3/4] more Signed-off-by: Takeshi Yoneda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bfb80e6..9ceb543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so . ##### Build the final image ##### -FROM envoyproxy/envoy:v1.35 AS envoy +FROM envoyproxy/envoy:v1.35-latest AS envoy ARG TARGETARCH ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so From 072e8a3dc58f90ff975c7b384ca25c0e9eb6ee86 Mon Sep 17 00:00:00 2001 From: Takeshi Yoneda Date: Tue, 29 Jul 2025 02:21:22 +0900 Subject: [PATCH 4/4] more Signed-off-by: Takeshi Yoneda --- go/gosdk/abi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/gosdk/abi.go b/go/gosdk/abi.go index fe33a2f..62e6428 100644 --- a/go/gosdk/abi.go +++ b/go/gosdk/abi.go @@ -162,7 +162,7 @@ import ( ) // https://github.com/envoyproxy/envoy/blob/84305a6cb64bd55aaf606bdd53de7cd6080427a1/source/extensions/dynamic_modules/abi_version.h -var version = append([]byte("cb17cd829c177bc6b75a920283a3347b90d5aaa4d5e723eaa33bad31c8c5b9a9"), 0) +var version = append([]byte("c32cc7696650a6a54653327e6609734a8b32aeb5c80a6a664687636a0d671666"), 0) //export envoy_dynamic_module_on_program_init func envoy_dynamic_module_on_program_init() uintptr {