From 11e4c7622bb902f3a577706622a7111608004374 Mon Sep 17 00:00:00 2001
From: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com>
Date: Fri, 20 Sep 2024 14:31:58 -0500
Subject: [PATCH] Manual backport rc branch (#625)

* Bump envoy version

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

diff --git a/.changelog/624.txt b/.changelog/624.txt
new file mode 100644
index 00000000..5218e7e9
--- /dev/null
+++ b/.changelog/624.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Upgrade envoy version to 1.31.2 to address [CVE-2024-45807](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-45807),[CVE-2024-45808](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-45808),[CVE-2024-45806](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-45806),[CVE-2024-45809](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-45809) and [CVE-2024-45810](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-45810)
+```
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7537f749..f7b1f40f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@
 # prebuilt binaries in any other form.
 #
 ARG GOLANG_VERSION
-FROM envoyproxy/envoy-distroless:v1.31.0 as envoy-binary
+FROM envoyproxy/envoy-distroless:v1.31.2 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.31.0-fips1402 as envoy-fips-binary
+FROM hashicorp/envoy-fips:1.31.2-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