Backport of Bump envoy 1.28.5 into release/1.5.x (#582)

* backport of commit 94e1d59 * backport of commit f0f2366 --------- Co-authored-by: Sarah Alsmiller <[email protected]>
hashicorp · Jul 5, 2024 · 59c7f1b · 59c7f1b
1 parent 5fd88e7
commit 59c7f1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.changelog/578.txt b/.changelog/578.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Upgrade envoy version to 1.29.7 to address [CVE-2024-39305](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39305)
+```
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@
 # prebuilt binaries in any other form.
 #
 ARG GOLANG_VERSION
-FROM envoyproxy/envoy-distroless:v1.29.5 as envoy-binary
+FROM envoyproxy/envoy-distroless:v1.29.7 as envoy-binary
 
 # Modify the envoy binary to be able to bind to privileged ports (< 1024).
 FROM debian:bullseye-slim AS setcap-envoy-binary
@@ -27,7 +27,7 @@ RUN apt-get update && apt install -y libcap2-bin
 RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/envoy
 RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/$BIN_NAME
 
-FROM hashicorp/envoy-fips:1.29.5-fips1402 as envoy-fips-binary
+FROM hashicorp/envoy-fips:1.29.7-fips1402 as envoy-fips-binary
 
 # Modify the envoy-fips binary to be able to bind to privileged ports (< 1024).
 FROM debian:bullseye-slim AS setcap-envoy-fips-binary