Skip to content

Commit 3dba875

Browse files
authored
Updates Envoy to v1.35 (#43)
Signed-off-by: Takeshi Yoneda <[email protected]>
1 parent 451a4b5 commit 3dba875

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu
4646
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 .
4747

4848
##### Build the final image #####
49-
FROM envoyproxy/envoy-dev:73fe00fc139fd5053f4c4a5d66569cc254449896 AS envoy
49+
FROM envoyproxy/envoy:v1.35-latest AS envoy
5050
ARG TARGETARCH
5151
ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib
5252
COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so

ENVOY_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
73fe00fc139fd5053f4c4a5d66569cc254449896
1+
84305a6cb64bd55aaf606bdd53de7cd6080427a1

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dynamic Modules Examples
22

3-
> Envoy Version: [73fe00fc139fd5053f4c4a5d66569cc254449896] v1.35-dev
3+
> Envoy Version: [84305a6cb64bd55aaf606bdd53de7cd6080427a1] v1.35
44
>
55
> Since dynamic modules are tied with a specific Envoy version, this repository is based on the specific commit of Envoy.
66
> For examples for a specific Envoy version, please check out `release/v<version>` 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
8787
ENVOY_IMAGE=foo-bar-image:latest go test . -v -count=1
8888
```
8989

90-
[73fe00fc139fd5053f4c4a5d66569cc254449896]: https://github.com/envoyproxy/envoy/tree/73fe00fc139fd5053f4c4a5d66569cc254449896
90+
[84305a6cb64bd55aaf606bdd53de7cd6080427a1]: https://github.com/envoyproxy/envoy/tree/84305a6cb64bd55aaf606bdd53de7cd6080427a1
9191
[Envoy]: https://github.com/envoyproxy/envoy
9292
[High Level Doc]: https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/dynamic_modules

go/gosdk/abi.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package gosdk
44

55
// Following is a distillation of the Envoy ABI for dynamic modules:
6-
// https://github.com/envoyproxy/envoy/blob/73fe00fc139fd5053f4c4a5d66569cc254449896/source/extensions/dynamic_modules/abi.h
6+
// https://github.com/envoyproxy/envoy/blob/84305a6cb64bd55aaf606bdd53de7cd6080427a1/source/extensions/dynamic_modules/abi.h
77
//
88
// Why not using the header file directly? That is because Go runtime complains
99
// about passing pointers to C code on the boundary. In the following code, we replace
@@ -161,8 +161,8 @@ import (
161161
"unsafe"
162162
)
163163

164-
// https://github.com/envoyproxy/envoy/blob/73fe00fc139fd5053f4c4a5d66569cc254449896/source/extensions/dynamic_modules/abi_version.h
165-
var version = append([]byte("cb17cd829c177bc6b75a920283a3347b90d5aaa4d5e723eaa33bad31c8c5b9a9"), 0)
164+
// https://github.com/envoyproxy/envoy/blob/84305a6cb64bd55aaf606bdd53de7cd6080427a1/source/extensions/dynamic_modules/abi_version.h
165+
var version = append([]byte("c32cc7696650a6a54653327e6609734a8b32aeb5c80a6a664687636a0d671666"), 0)
166166

167167
//export envoy_dynamic_module_on_program_init
168168
func envoy_dynamic_module_on_program_init() uintptr {

rust/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/envoyproxy/dynamic-modules-example"
88

99
[dependencies]
1010
# The SDK version must match the Envoy version due to the strict compatibility requirements.
11-
envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "73fe00fc139fd5053f4c4a5d66569cc254449896" }
11+
envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "84305a6cb64bd55aaf606bdd53de7cd6080427a1" }
1212
serde = { version = "1.0", features = ["derive"] }
1313
serde_json = "1.0"
1414
rand = "0.9.0"

0 commit comments

Comments
 (0)