From 0f87d1f8fd890042c8d0c02f3432c66f9fa6c0a8 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Mon, 5 May 2025 12:23:28 -0400
Subject: [PATCH 01/18] Bump envoy to 1.34.0-patch1

---
 Makefile                                      |  2 +-
 .../v1.20.0-beta2/envoy-gloo-1.34-bump.yaml   |  7 ++
 devel/tools/changelog.sh                      | 99 ++++++++++++++++---
 3 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml

diff --git a/Makefile b/Makefile
index 24bfbd39b25..457f0aac4a8 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 # for more information, see https://github.com/solo-io/gloo/pull/9633
 # and
 # https://soloio.slab.com/posts/extended-http-methods-design-doc-40j7pjeu
-ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.33.2-patch2
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:75083742d304a46200a5309d927ecc24c9def012
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 
diff --git a/changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml
new file mode 100644
index 00000000000..618a569410a
--- /dev/null
+++ b/changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml
@@ -0,0 +1,7 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo-ee
+    dependencyTag: 1.34.0-patch1
diff --git a/devel/tools/changelog.sh b/devel/tools/changelog.sh
index e33f4f5562e..a7751053614 100755
--- a/devel/tools/changelog.sh
+++ b/devel/tools/changelog.sh
@@ -1,6 +1,16 @@
 #!/bin/bash
 
-set -e
+# Create a changelog file. This script automatically creates a file in the
+# correct changelog directory. You can also pass the `-e` flag if you want to
+# edit the file after creation. You can also use `-t` to specify which kind of
+# changelog entry you would like to create (`-t FIX` or `-t DEPENDENCY_BUMP`
+# for example). This script can be called multiple times, and it will
+# automatically append additional changelog entries to the changelog file in
+# question. So you could run `devel/tools/changelog.sh -t FIX` and then after
+# that you could run `devel/tools/changelog.sh -t DEPENDENCY_BUMP` and both of
+# those entries would appear in the file.
+
+set -euo pipefail
 
 CURRENT_VERSION=$(git describe --tags --always --abbrev=0)
 OLD_VERSION=$(echo -n $CURRENT_VERSION | sed -E 's/.*[^0-9]([0-9]+)$/\1/')
@@ -14,24 +24,87 @@ mkdir -p "$CHANGELOG_DIR"
 
 CHANGELOG_FILE="$CHANGELOG_DIR/$BRANCH_NAME.yaml"
 
-if [[ ! -f $CHANGELOG_FILE ]]; then
-    echo "Creating $CHANGELOG_FILE"
+##################################################
+# OPTION FLAGS
+OPT_EDIT=false # should we open the changelog file in $EDITOR?
+OPT_CHANGELOG_TYPE="" # NEW_FEATURE, DEPENDENCY_BUMP, ENVOY_DEPENDENCY_BUMP, NON_USER_FACING
+
+##################################################
+# OPTION PARSING
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -e|--edit)
+      OPT_EDIT=true
+      shift
+      ;;
+    --no-edit)
+      OPT_EDIT=false
+      shift
+      ;;
+    -t|--type)
+      OPT_CHANGELOG_TYPE="$2"
+      shift
+      shift
+      ;;
+  esac
+done
+##################################################
+# if the file does not exist, create it by adding the initial "changelog": line
+test -f "${CHANGELOG_FILE}" || echo "changelog:" >> "${CHANGELOG_FILE}"
 
-    cat << EOF > "$CHANGELOG_FILE"
-changelog:
+##################################################
+# process the -t flag to add the templated changelog entries
+case "$OPT_CHANGELOG_TYPE" in
+  FIX)
+    echo "creating FIX changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
   - type: FIX
     issueLink:
     resolvesIssue: false
     description: >-
       "${DESCRIPTION}"
 EOF
+    ;;
+  NEW_FEATURE)
+    echo "creating NEW_FEATURE changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
+  - type: NEW_FEATURE
+    issueLink:
+    resolvesIssue: false
+    description: >-
+      "${DESCRIPTION}"
+EOF
+    ;;
+  DEPENDENCY_BUMP)
+    echo "creating DEPENDENCY_BUMP changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: # solo-io
+    dependencyRepo: # gloo
+    dependencyTag: # v0.7.0
+EOF
+    ;;
+  ENVOY_DEPENDENCY_BUMP)
+    echo "creating ENVOY DEPENDENCY_BUMP changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo-ee
+    dependencyTag: # 1.33.0-patch3
+EOF
+    ;;
+esac
 
-echo "Wrote to $CHANGELOG_FILE"
-fi
-
-# TODO this is a quick hack to avoid args parsing. If this script grows in complexity,
-# parsing args will be more appropriate than this check.
-if [[ $# > 0 ]] && [[ "$1" == "edit" ]]; then
-    echo "Editing..."
-    "$EDITOR" "$CHANGELOG_FILE"
+##################################################
+# Edit the file if `-e` was provided
+if $OPT_EDIT ; then
+  exec "$EDITOR" "${CHANGELOG_FILE}"
 fi

From 68a4509405eab264ab2c585cc9fe2eb7ddabeab6 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 14 May 2025 17:06:53 +0000
Subject: [PATCH 02/18] Adding changelog file to new location

---
 changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml

diff --git a/changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml
new file mode 100644
index 00000000000..618a569410a
--- /dev/null
+++ b/changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml
@@ -0,0 +1,7 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo-ee
+    dependencyTag: 1.34.0-patch1

From e830a17601360e03e8a53618a65b6caae7d60ebc Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 14 May 2025 17:06:54 +0000
Subject: [PATCH 03/18] Deleting changelog file from old location

---
 changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml

diff --git a/changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml
deleted file mode 100644
index 618a569410a..00000000000
--- a/changelog/v1.20.0-beta2/envoy-gloo-1.34-bump.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-changelog:
-  - type: DEPENDENCY_BUMP
-    issueLink:
-    resolvesIssue: false
-    dependencyOwner: solo-io
-    dependencyRepo: envoy-gloo-ee
-    dependencyTag: 1.34.0-patch1

From 3813d2c792ff56ca59678da29f530431c5d74f73 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 29 May 2025 20:18:34 +0000
Subject: [PATCH 04/18] Adding changelog file to new location

---
 changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml

diff --git a/changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml
new file mode 100644
index 00000000000..618a569410a
--- /dev/null
+++ b/changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml
@@ -0,0 +1,7 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo-ee
+    dependencyTag: 1.34.0-patch1

From c37985034187e79fd296295a5e094dadd09d0b42 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 29 May 2025 20:18:34 +0000
Subject: [PATCH 05/18] Deleting changelog file from old location

---
 changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml

diff --git a/changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml
deleted file mode 100644
index 618a569410a..00000000000
--- a/changelog/v1.20.0-beta3/envoy-gloo-1.34-bump.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-changelog:
-  - type: DEPENDENCY_BUMP
-    issueLink:
-    resolvesIssue: false
-    dependencyOwner: solo-io
-    dependencyRepo: envoy-gloo-ee
-    dependencyTag: 1.34.0-patch1

From e553fca738d73a80e7574697e27316b4691c2717 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 6 Jun 2025 19:43:13 +0000
Subject: [PATCH 06/18] Adding changelog file to new location

---
 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml

diff --git a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
new file mode 100644
index 00000000000..618a569410a
--- /dev/null
+++ b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
@@ -0,0 +1,7 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo-ee
+    dependencyTag: 1.34.0-patch1

From 31b86efb74084ec2ea68a849c4f59722e5266fcb Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 6 Jun 2025 19:43:13 +0000
Subject: [PATCH 07/18] Deleting changelog file from old location

---
 changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml

diff --git a/changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml
deleted file mode 100644
index 618a569410a..00000000000
--- a/changelog/v1.20.0-beta4/envoy-gloo-1.34-bump.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-changelog:
-  - type: DEPENDENCY_BUMP
-    issueLink:
-    resolvesIssue: false
-    dependencyOwner: solo-io
-    dependencyRepo: envoy-gloo-ee
-    dependencyTag: 1.34.0-patch1

From 4691cb3afb53a9c8b2b9bf7f835d9492f3141826 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Mon, 9 Jun 2025 15:56:22 -0400
Subject: [PATCH 08/18] Update to released version of envoy

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9f5c67a8a85..7cb65617a33 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 # for more information, see https://github.com/solo-io/gloo/pull/9633
 # and
 # https://soloio.slab.com/posts/extended-http-methods-design-doc-40j7pjeu
-ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:75083742d304a46200a5309d927ecc24c9def012
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:v1.34.1-patch1
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 

From ccbd0c034b716cfbfb59c5763b200dfa203a1e3c Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Mon, 9 Jun 2025 15:57:13 -0400
Subject: [PATCH 09/18] Remove `v`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7cb65617a33..8d604cbd16d 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 # for more information, see https://github.com/solo-io/gloo/pull/9633
 # and
 # https://soloio.slab.com/posts/extended-http-methods-design-doc-40j7pjeu
-ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:v1.34.1-patch1
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.34.1-patch1
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 

From 813e15e66fb7679300846c24b4c3346a21627864 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Mon, 9 Jun 2025 16:15:54 -0400
Subject: [PATCH 10/18] Update changelog and version

---
 Makefile                                          | 2 +-
 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8d604cbd16d..dcce69c79a6 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 # for more information, see https://github.com/solo-io/gloo/pull/9633
 # and
 # https://soloio.slab.com/posts/extended-http-methods-design-doc-40j7pjeu
-ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.34.1-patch1
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.34.1-patch2
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 
diff --git a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
index 618a569410a..d25f3884d32 100644
--- a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
+++ b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
@@ -4,4 +4,4 @@ changelog:
     resolvesIssue: false
     dependencyOwner: solo-io
     dependencyRepo: envoy-gloo-ee
-    dependencyTag: 1.34.0-patch1
+    dependencyTag: 1.34.1-patch2

From c736f5f4437a8831fd4e2a37e9d974ab5bcf2c5e Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 12:09:52 -0400
Subject: [PATCH 11/18] Update go-control-plane

---
 go.mod | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 3920ca0b170..37f950e6a1a 100644
--- a/go.mod
+++ b/go.mod
@@ -12,9 +12,10 @@ require (
 	github.com/aws/aws-sdk-go v1.34.9
 	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42
 	github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa
-	github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250207140015-90270e3c85fd
-	github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250211152746-ef139ef8ea6b
-	github.com/envoyproxy/go-control-plane/ratelimit v0.1.0
+	github.com/envoyproxy/go-control-plane v0.13.5-0.20250507123352-93990c5ec02f
+	github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250507123352-93990c5ec02f
+	github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250507123352-93990c5ec02f
+	github.com/envoyproxy/go-control-plane/ratelimit v0.1.1-0.20250507123352-93990c5ec02f
 	github.com/envoyproxy/protoc-gen-validate v1.2.1
 	github.com/form3tech-oss/jwt-go v3.2.5+incompatible
 	github.com/fsnotify/fsnotify v1.8.0
@@ -93,7 +94,6 @@ require (
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20240214155107-6cf1ede4da61
 	github.com/avast/retry-go/v4 v4.3.3
-	github.com/envoyproxy/go-control-plane v0.13.5-0.20250123154839-2a6715911fec
 	github.com/go-logr/zapr v1.3.0
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/golang/mock v1.6.0

From cf08f6d3f55a6b37d09ffe737ddba294d2214341 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 12:36:23 -0400
Subject: [PATCH 12/18] Codegen

---
 docs/content/static/content/osa_provided.md   | 18 ++++----
 go.mod                                        | 14 +++---
 go.sum                                        | 43 ++++++++++---------
 .../hack/filter_types/filter_types.gen.go     | 18 ++++++++
 4 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/docs/content/static/content/osa_provided.md b/docs/content/static/content/osa_provided.md
index b892788a890..41ee155effb 100644
--- a/docs/content/static/content/osa_provided.md
+++ b/docs/content/static/content/osa_provided.md
@@ -8,10 +8,10 @@ Name|Version|License
 [aws/aws-sdk-go](https://github.com/aws/aws-sdk-go)|v1.34.9|Apache License 2.0
 [xds/go](https://github.com/cncf/xds)|v0.0.0-20250121191232-2f005788dc42|Apache License 2.0
 [cratonica/2goarray](https://github.com/cratonica/2goarray)|v0.0.0-20190331194516-514510793eaa|MIT License
-[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.5-0.20250123154839-2a6715911fec|Apache License 2.0
-[go-control-plane/contrib](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250207140015-90270e3c85fd|Apache License 2.0
-[go-control-plane/envoy](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250211152746-ef139ef8ea6b|Apache License 2.0
-[go-control-plane/ratelimit](https://github.com/envoyproxy/go-control-plane)|v0.1.0|Apache License 2.0
+[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.5-0.20250507123352-93990c5ec02f|Apache License 2.0
+[go-control-plane/contrib](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250507123352-93990c5ec02f|Apache License 2.0
+[go-control-plane/envoy](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250507123352-93990c5ec02f|Apache License 2.0
+[go-control-plane/ratelimit](https://github.com/envoyproxy/go-control-plane)|v0.1.1-0.20250507123352-93990c5ec02f|Apache License 2.0
 [envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate)|v1.2.1|Apache License 2.0
 [form3tech-oss/jwt-go](https://github.com/form3tech-oss/jwt-go)|v3.2.5+incompatible|MIT License
 [fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
@@ -43,7 +43,7 @@ Name|Version|License
 [pkg/browser](https://github.com/pkg/browser)|v0.0.0-20180916011732-0a3d74bf9ce4|BSD 2-clause "Simplified" License
 [pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License
 [prometheus/client_golang](https://github.com/prometheus/client_golang)|v1.20.5|Apache License 2.0
-[prometheus/client_model](https://github.com/prometheus/client_model)|v0.6.1|Apache License 2.0
+[prometheus/client_model](https://github.com/prometheus/client_model)|v0.6.2|Apache License 2.0
 [prometheus/common](https://github.com/prometheus/common)|v0.62.0|Apache License 2.0
 [go-ruleguard/dsl](https://github.com/quasilyte/go-ruleguard)|v0.3.22|BSD 3-clause "New" or "Revised" License
 [rotisserie/eris](https://github.com/rotisserie/eris)|v0.5.4|MIT License
@@ -56,7 +56,7 @@ Name|Version|License
 [stoewer/go-strcase](https://github.com/stoewer/go-strcase)|v1.3.0|MIT License
 [stretchr/testify](https://github.com/stretchr/testify)|v1.10.0|MIT License
 [go.opencensus.io](https://go.opencensus.io)|v0.24.0|Apache License 2.0
-[proto/otlp](https://go.opentelemetry.io/proto/otlp)|v1.5.0|Apache License 2.0
+[proto/otlp](https://go.opentelemetry.io/proto/otlp)|v1.6.0|Apache License 2.0
 [go.uber.org/goleak](https://go.uber.org/goleak)|v1.3.0|MIT License
 [go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
 [go.uber.org/zap](https://go.uber.org/zap)|v1.27.0|MIT License
@@ -65,9 +65,9 @@ Name|Version|License
 [x/mod](https://golang.org/x/mod)|v0.23.0|BSD 3-clause "New" or "Revised" License
 [x/sync](https://golang.org/x/sync)|v0.13.0|BSD 3-clause "New" or "Revised" License
 [x/tools](https://golang.org/x/tools)|v0.30.0|BSD 3-clause "New" or "Revised" License
-[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20250122153221-138b5a5a4fd4|Apache License 2.0
-[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20250122153221-138b5a5a4fd4|Apache License 2.0
-[google.golang.org/grpc](https://google.golang.org/grpc)|v1.71.1|Apache License 2.0
+[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20250428153025-10db94c68c34|Apache License 2.0
+[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20250428153025-10db94c68c34|Apache License 2.0
+[google.golang.org/grpc](https://google.golang.org/grpc)|v1.72.0|Apache License 2.0
 [google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.36.6|BSD 3-clause "New" or "Revised" License
 [AlecAivazis/survey.v1](https://gopkg.in/AlecAivazis/survey.v1)|v1.8.7|MIT License
 [helm/v3](https://helm.sh/helm/v3)|v3.17.0|Apache License 2.0
diff --git a/go.mod b/go.mod
index 37f950e6a1a..a4fe9593f92 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/solo-io/gloo
 
-go 1.24.1
+go 1.24.2
 
 // Note for developers: upgrading go will also require upgrading go in the following files:
 // ./cloudbuild-cache.yaml,
@@ -72,7 +72,7 @@ require (
 	golang.org/x/crypto v0.37.0
 	golang.org/x/sync v0.13.0
 	golang.org/x/tools v0.30.0
-	google.golang.org/grpc v1.71.1
+	google.golang.org/grpc v1.72.0
 	google.golang.org/protobuf v1.36.6
 	gopkg.in/AlecAivazis/survey.v1 v1.8.7
 	helm.sh/helm/v3 v3.17.0
@@ -101,17 +101,17 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/mccutchen/go-httpbin/v2 v2.15.0
 	github.com/prometheus/client_golang v1.20.5
-	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/client_model v0.6.2
 	github.com/prometheus/common v0.62.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/solo-io/cue v0.4.7
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/stretchr/testify v1.10.0
-	go.opentelemetry.io/proto/otlp v1.5.0
+	go.opentelemetry.io/proto/otlp v1.6.0
 	golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
 	golang.org/x/mod v0.23.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4
+	google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34
 	istio.io/api v1.25.2-0.20250410212420-84c271001f68
 	istio.io/client-go v1.25.2-0.20250410213018-e5f6074bc228
 	istio.io/istio v0.0.0-20250411142419-0d83506c2883
@@ -120,7 +120,7 @@ require (
 )
 
 require (
-	cel.dev/expr v0.19.1 // indirect
+	cel.dev/expr v0.20.0 // indirect
 	contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
 	cuelang.org/go v0.10.0 // indirect
 	dario.cat/mergo v1.0.1 // indirect
diff --git a/go.sum b/go.sum
index cda8d0dbd54..abbf4dd7976 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 cel.dev/expr v0.15.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg=
 cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
-cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
-cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
+cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI=
+cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -1635,14 +1635,14 @@ github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCw
 github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
 github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
 github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0=
-github.com/envoyproxy/go-control-plane v0.13.5-0.20250123154839-2a6715911fec h1:JSSbRTQjlgxvbu742IwK/v3mrNWRz2U1GjY66DqogNo=
-github.com/envoyproxy/go-control-plane v0.13.5-0.20250123154839-2a6715911fec/go.mod h1:yz4MTDY0h9ObVlfP15ykR737j5tP/z64qu0OzSRoobk=
-github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250207140015-90270e3c85fd h1:TD14U3GE5CX1CmPLlPBd/YJR7OAO61NVE19c97h8pV4=
-github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250207140015-90270e3c85fd/go.mod h1:gkGYoY7plfQg7FPBDhyKtP1cDA9frFR/3YsCx8taRvI=
-github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250211152746-ef139ef8ea6b h1:adF1AKcjarVahD0ZmbrM16EcBwtfZvptRkbLuJeZX6o=
-github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250211152746-ef139ef8ea6b/go.mod h1:+c8rr9dxbNVDIsk/MjCS2w70FIwGEJG9zbaxz6u/fRg=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
+github.com/envoyproxy/go-control-plane v0.13.5-0.20250507123352-93990c5ec02f h1:0SovjSoiK8Xd3WmmR0AJhCOUr9CFmHD1iurwL3/ChOY=
+github.com/envoyproxy/go-control-plane v0.13.5-0.20250507123352-93990c5ec02f/go.mod h1:0qUBm7c5rAt4tPgVIf20MXebCvZSoir1mQZIFMzHWtU=
+github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250507123352-93990c5ec02f h1:8Q48+OtVytah0PvjbMgDvAeTuPiOs4+d5q4kNPbsFnw=
+github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250507123352-93990c5ec02f/go.mod h1:f+xWFgX4KgG6AO6OYv3iH35x01oxj5nU1PSbT3Xixyo=
+github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250507123352-93990c5ec02f h1:EkvqIU8ltMRQcOUboGq22suL1jbI4lKkX8OxOrSwmeQ=
+github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250507123352-93990c5ec02f/go.mod h1:AX9FHliK8udCyqscHGV+mjWBy2ODJ5Rqt/CtfUWO02I=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.1-0.20250507123352-93990c5ec02f h1:VWpzyGd4X6+m72F5roMJy6n4eg3ExVIbiKEkHqWaNJU=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.1-0.20250507123352-93990c5ec02f/go.mod h1:XwRfO4L5F5f2M22/plL7eNluEEJe8MOqb9KvAy34fTA=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
@@ -2088,8 +2088,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4Zs
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.28.2 h1:mXfkRHrpHN4YY3RqL09nXU1eHKLNiuAN4kHvDQ16k/8=
 github.com/hashicorp/consul/api v1.28.2/go.mod h1:KyzqzgMEya+IZPcD65YFoOVAgPpbfERu4I/tzG6/ueE=
@@ -2580,8 +2580,9 @@ github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3d
 github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
 github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
 github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -2934,8 +2935,8 @@ go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A=
 go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
-go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
-go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI=
+go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -3883,8 +3884,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.
 google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g=
 google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
 google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo=
-google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4 h1://y4MHaM7tNLqTeWKyfBIeoAMxwKwRm/nODb5IKA3BE=
-google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4/go.mod h1:AfA77qWLcidQWywD0YgqfpJzf50w2VjzBml3TybHeJU=
+google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34 h1:0PeQib/pH3nB/5pEmFeVQJotzGohV0dq4Vcp09H5yhE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34/go.mod h1:0awUlEkap+Pb1UMeJwJQQAdJQrt3moU7J2moTy69irI=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw=
@@ -3936,8 +3937,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4 h1:yrTuav+chrF0zF/joFGICKTzYv7mh/gr9AgEXrVU8ao=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 h1:h6p3mQqrmT1XkHVTfzLdNz1u7IhINeZkz67/xTbOuWs=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
@@ -4001,8 +4002,8 @@ google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDom
 google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
 google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
 google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
-google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
-google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
diff --git a/projects/envoyinit/hack/filter_types/filter_types.gen.go b/projects/envoyinit/hack/filter_types/filter_types.gen.go
index c17c312ae22..3e4abf2a985 100644
--- a/projects/envoyinit/hack/filter_types/filter_types.gen.go
+++ b/projects/envoyinit/hack/filter_types/filter_types.gen.go
@@ -149,6 +149,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/on_demand/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/original_src/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/proto_api_scrubber/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/proto_message_extraction/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v3"
@@ -173,6 +174,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/echo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_authz/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_proc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/action/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3"
@@ -213,6 +215,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/local_response_policy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/redirect_policy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/early_header_mutation/header_mutation/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/ext_proc/response_processors/save_processing_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_validators/envoy_default/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/injected_credentials/generic/v3"
@@ -253,6 +256,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/path/rewrite/uri_template/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_debug_visitor/quic_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_debug_visitor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_id_generator/quic_lb/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_id_generator/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/crypto_stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/proof_source/v3"
@@ -260,8 +264,10 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rate_limit_descriptors/expr/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/matchers/upstream_ip_port/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/principals/mtls_authenticated/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/regex_engines/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/cgroup_memory/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/cpu_utilization/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/downstream_connections/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3"
@@ -271,10 +277,12 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/previous_hosts/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/priority/previous_priorities/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/router/cluster_specifiers/lua/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/router/cluster_specifiers/matcher/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/graphite_statsd/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/open_telemetry/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/string_matcher/lua/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/fluentd/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/opentelemetry/resource_detectors/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/opentelemetry/samplers/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/alts/v3"
@@ -310,6 +318,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/network_ext_proc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/redis_auth/v3"
@@ -441,6 +450,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/on_demand/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/original_src/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/proto_api_scrubber/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/proto_message_extraction/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v3"
@@ -465,6 +475,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/echo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_authz/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_proc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/action/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3"
@@ -505,6 +516,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/local_response_policy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/redirect_policy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/early_header_mutation/header_mutation/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/ext_proc/response_processors/save_processing_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_validators/envoy_default/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/injected_credentials/generic/v3"
@@ -545,6 +557,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/path/rewrite/uri_template/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_debug_visitor/quic_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_debug_visitor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_id_generator/quic_lb/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_id_generator/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/crypto_stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/proof_source/v3"
@@ -552,8 +565,10 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rate_limit_descriptors/expr/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/audit_loggers/stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/matchers/upstream_ip_port/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/principals/mtls_authenticated/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/regex_engines/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/cgroup_memory/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/cpu_utilization/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/downstream_connections/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3"
@@ -563,10 +578,12 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/previous_hosts/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/priority/previous_priorities/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/router/cluster_specifiers/lua/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/router/cluster_specifiers/matcher/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/graphite_statsd/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/open_telemetry/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/string_matcher/lua/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/fluentd/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/opentelemetry/resource_detectors/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/opentelemetry/samplers/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/alts/v3"
@@ -602,6 +619,7 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/network_ext_proc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/redis_auth/v3"

From 0efc1bbbf53a7af55f4ca78990a04d7167fd6def Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 12:39:06 -0400
Subject: [PATCH 13/18] Update changelog

---
 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml | 10 ++++++++--
 devel/tools/changelog.sh                          |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
index d25f3884d32..81814f87cab 100644
--- a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
+++ b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
@@ -1,7 +1,13 @@
 changelog:
   - type: DEPENDENCY_BUMP
-    issueLink:
+    issueLink: https://github.com/solo-io/solo-projects/issues/8103
     resolvesIssue: false
     dependencyOwner: solo-io
-    dependencyRepo: envoy-gloo-ee
+    dependencyRepo: envoy-gloo
     dependencyTag: 1.34.1-patch2
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: envoyproxy
+    dependencyRepo: go-control-plane
+    dependencyTag: v0.13.5-0.20250507123352-93990c5ec02f
diff --git a/devel/tools/changelog.sh b/devel/tools/changelog.sh
index a7751053614..9ee601039cf 100755
--- a/devel/tools/changelog.sh
+++ b/devel/tools/changelog.sh
@@ -97,7 +97,7 @@ EOF
     issueLink:
     resolvesIssue: false
     dependencyOwner: solo-io
-    dependencyRepo: envoy-gloo-ee
+    dependencyRepo: envoy-gloo
     dependencyTag: # 1.33.0-patch3
 EOF
     ;;

From f18b6ff7209ff269aa79f583611aeaad9d3821e1 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 13:00:53 -0400
Subject: [PATCH 14/18] Update go to 1.24.4

---
 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml | 6 ++++++
 go.mod                                            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
index 81814f87cab..ef1b834f8bf 100644
--- a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
+++ b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
@@ -11,3 +11,9 @@ changelog:
     dependencyOwner: envoyproxy
     dependencyRepo: go-control-plane
     dependencyTag: v0.13.5-0.20250507123352-93990c5ec02f
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: golang
+    dependencyRepo: go
+    dependencyTag: v1.24.4
diff --git a/go.mod b/go.mod
index a4fe9593f92..126f375a0aa 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/solo-io/gloo
 
-go 1.24.2
+go 1.24.4
 
 // Note for developers: upgrading go will also require upgrading go in the following files:
 // ./cloudbuild-cache.yaml,

From e31de0847fff2a9ac3d93a2f4104f9b486db6a8c Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 13:55:59 -0400
Subject: [PATCH 15/18] Update _GO_VERSION in cloudbuild-cache.yaml

---
 cloudbuild-cache.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudbuild-cache.yaml b/cloudbuild-cache.yaml
index 991566fb977..13521ec78c9 100644
--- a/cloudbuild-cache.yaml
+++ b/cloudbuild-cache.yaml
@@ -1,6 +1,6 @@
 options:
   env:
-    - "_GO_VERSION=1.24.1"
+    - "_GO_VERSION=1.24.4"
 
 steps:
 - name: gcr.io/cloud-builders/gsutil

From 90cc883f6b292ee6d9f5d74d95bb2c7cb7a83af0 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 13:59:57 -0400
Subject: [PATCH 16/18] Revert go update

---
 cloudbuild-cache.yaml | 2 +-
 go.mod                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudbuild-cache.yaml b/cloudbuild-cache.yaml
index 13521ec78c9..991566fb977 100644
--- a/cloudbuild-cache.yaml
+++ b/cloudbuild-cache.yaml
@@ -1,6 +1,6 @@
 options:
   env:
-    - "_GO_VERSION=1.24.4"
+    - "_GO_VERSION=1.24.1"
 
 steps:
 - name: gcr.io/cloud-builders/gsutil
diff --git a/go.mod b/go.mod
index 126f375a0aa..2b63493cfc7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/solo-io/gloo
 
-go 1.24.4
+go 1.24.1
 
 // Note for developers: upgrading go will also require upgrading go in the following files:
 // ./cloudbuild-cache.yaml,

From 2389d07bc2b940b9eb1622f70c173226099406a7 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Tue, 10 Jun 2025 14:02:56 -0400
Subject: [PATCH 17/18] Remove golang update from changelog

---
 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
index ef1b834f8bf..81814f87cab 100644
--- a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
+++ b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
@@ -11,9 +11,3 @@ changelog:
     dependencyOwner: envoyproxy
     dependencyRepo: go-control-plane
     dependencyTag: v0.13.5-0.20250507123352-93990c5ec02f
-  - type: DEPENDENCY_BUMP
-    issueLink:
-    resolvesIssue: false
-    dependencyOwner: golang
-    dependencyRepo: go
-    dependencyTag: v1.24.4

From f88c14b5a7a1c046d42141fd578bea9f8c9570a5 Mon Sep 17 00:00:00 2001
From: Ashish Banerjee <ashish.banerjee@solo.io>
Date: Mon, 16 Jun 2025 10:54:10 -0400
Subject: [PATCH 18/18] Update to envoy 1.34.1-patch3

---
 Makefile                                          | 2 +-
 changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dcce69c79a6..b5685267481 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 # for more information, see https://github.com/solo-io/gloo/pull/9633
 # and
 # https://soloio.slab.com/posts/extended-http-methods-design-doc-40j7pjeu
-ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.34.1-patch2
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.34.1-patch3
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 
diff --git a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
index 81814f87cab..5a6bc5c696e 100644
--- a/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
+++ b/changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml
@@ -4,7 +4,7 @@ changelog:
     resolvesIssue: false
     dependencyOwner: solo-io
     dependencyRepo: envoy-gloo
-    dependencyTag: 1.34.1-patch2
+    dependencyTag: 1.34.1-patch3
   - type: DEPENDENCY_BUMP
     issueLink:
     resolvesIssue: false