backport of commit 94e1d59

hashicorp · Jul 5, 2024 · 5731a29 · 5731a29
1 parent 4584c80
commit 5731a29
Show file tree

Hide file tree

Showing 112 changed files with 582 additions and 5,483 deletions.
diff --git a/.changelog/142.txt b/.changelog/142.txt
diff --git a/.changelog/164.txt b/.changelog/164.txt
diff --git a/.changelog/172.txt b/.changelog/172.txt
diff --git a/.changelog/188.txt b/.changelog/188.txt
diff --git a/.changelog/235.txt b/.changelog/235.txt
diff --git a/.changelog/236.txt b/.changelog/236.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Update to Go 1.20.7 and Envoy 1.25.9 within the Dockerfile.
+```
diff --git a/.changelog/239.txt b/.changelog/239.txt
diff --git a/.changelog/242.txt b/.changelog/242.txt
diff --git a/.changelog/310.txt b/.changelog/310.txt
diff --git a/.changelog/312.txt b/.changelog/312.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Update Envoy version to 1.25.11 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76)
+```
diff --git a/.changelog/372.txt b/.changelog/372.txt
diff --git a/.changelog/416.txt → .changelog/418.txt b/.changelog/416.txt → .changelog/418.txt
@@ -1,6 +1,3 @@
-```release-note:improvement
-Update Envoy version from 1.27 to 1.28
-```
 ```release-note:security
-Update Envoy version to 1.28.1 to address [CVE-2024-23324](https://github.com/envoyproxy/envoy/security/advisories/GHSA-gq3v-vvhj-96j6), [CVE-2024-23325](https://github.com/envoyproxy/envoy/security/advisories/GHSA-5m7c-mrwr-pm26), [CVE-2024-23322](https://github.com/envoyproxy/envoy/security/advisories/GHSA-6p83-mfmh-qv38), [CVE-2024-23323](https://github.com/envoyproxy/envoy/security/advisories/GHSA-x278-4w4x-r7ch), [CVE-2024-23327](https://github.com/envoyproxy/envoy/security/advisories/GHSA-4h5x-x9vh-m29j), and [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76)
+Update Envoy version to 1.26.7 to address [CVE-2024-23324](https://github.com/envoyproxy/envoy/security/advisories/GHSA-gq3v-vvhj-96j6), [CVE-2024-23325](https://github.com/envoyproxy/envoy/security/advisories/GHSA-5m7c-mrwr-pm26), [CVE-2024-23322](https://github.com/envoyproxy/envoy/security/advisories/GHSA-6p83-mfmh-qv38), [CVE-2024-23323](https://github.com/envoyproxy/envoy/security/advisories/GHSA-x278-4w4x-r7ch), [CVE-2024-23327](https://github.com/envoyproxy/envoy/security/advisories/GHSA-4h5x-x9vh-m29j), and [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76) (note: upgrades to Envoy 1.26 for security patches due to 1.25 EOL)
 ```
diff --git a/.changelog/434.txt b/.changelog/434.txt
diff --git a/.changelog/474.txt → .changelog/475.txt b/.changelog/474.txt → .changelog/475.txt
@@ -4,7 +4,7 @@ Upgrade to use Go `1.21.9`. This resolves CVE
 ```
 
 ```release-note:security
-Upgrade to support Envoy `1.28.2`. This resolves CVE
+Upgrade to support Envoy `1.26.8`. This resolves CVE
 [CVE-2024-27919](https://nvd.nist.gov/vuln/detail/CVE-2024-27919) (`http2`).
 ```
 

diff --git a/.changelog/496.txt → .changelog/499.txt b/.changelog/496.txt → .changelog/499.txt
@@ -1,4 +1,4 @@
 ```release-note:security
-Upgrade to support Envoy `1.28.3`. This resolves CVE
+Upgrade to support Envoy `1.27.5`. This resolves CVE
 [CVE-2024-32475](https://nvd.nist.gov/vuln/detail/CVE-2024-32475).
 ```
diff --git a/.changelog/521.txt b/.changelog/521.txt
diff --git a/.changelog/529.txt b/.changelog/529.txt
diff --git a/.changelog/533.txt b/.changelog/533.txt
diff --git a/.changelog/543.txt b/.changelog/543.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Upgrade to support Envoy `1.27.6`.
+```
diff --git a/.changelog/565.txt b/.changelog/565.txt
diff --git a/.changelog/573.txt b/.changelog/573.txt
diff --git a/.changelog/97.txt b/.changelog/97.txt
diff --git a/.changelog/98.txt b/.changelog/98.txt
@@ -0,0 +1,3 @@
+```release-note:security
+Update to Go 1.20.4 and Envoy 1.25.6 within the Dockerfile. 
+```
diff --git a/.github/workflows/bot-auto-approve.yaml b/.github/workflows/bot-auto-approve.yaml