From c30b874c4e0ef664774f66cb6f19d01c6dedd8bb Mon Sep 17 00:00:00 2001
From: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com>
Date: Fri, 5 Jul 2024 10:38:20 -0500
Subject: [PATCH] Bump envoy 1.29.7 (#578)

* bump envoy

* changelog
---
 .changelog/578.txt | 3 +++
 Dockerfile         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/578.txt

diff --git a/.changelog/578.txt b/.changelog/578.txt
new file mode 100644
index 00000000..df886c24
--- /dev/null
+++ 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)
+```
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c8b92424..c548f2e9 100644
--- 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