From 4d967c194137fb2a013b8fb1d5a267698015b5f6 Mon Sep 17 00:00:00 2001
From: Nathan Fudenberg <nathan.fudenberg@solo.io>
Date: Mon, 13 Jan 2025 13:42:20 -0500
Subject: [PATCH] 1.18 envoy: bump for an edge case in transformation stages
 (#10570)

---
 Makefile                                     | 2 +-
 changelog/v1.18.5/transforms-same-stage.yaml | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 changelog/v1.18.5/transforms-same-stage.yaml

diff --git a/Makefile b/Makefile
index 87cad29f4b9..d5409410274 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.31.5-patch1
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.31.5-patch2
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 
diff --git a/changelog/v1.18.5/transforms-same-stage.yaml b/changelog/v1.18.5/transforms-same-stage.yaml
new file mode 100644
index 00000000000..44fddbb02ac
--- /dev/null
+++ b/changelog/v1.18.5/transforms-same-stage.yaml
@@ -0,0 +1,9 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    issueLink: https://github.com/solo-io/solo-projects/issues/7635
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo
+    dependencyTag: v1.31.5-patch2
+    resolvesIssue: false
+    description: >-
+      Fixes an issue where a header is a source for an extractor, is modified and then that extractor is used later.
\ No newline at end of file