From 4b5b068b42cb3043815ef749de3bc506a82996e8 Mon Sep 17 00:00:00 2001
From: Nathan Fudenberg <nathan.fudenberg@solo.io>
Date: Fri, 8 Sep 2023 12:36:14 -0400
Subject: [PATCH] bazel: Switch to envoy fork (#268)

* bazel: Switch to envoy fork

* bazel: Updated hash

* bazel: Updated comments

* bazel: Update comment for correctness
---
 bazel/repository_locations.bzl           | 8 +++++---
 changelog/v1.26.4-patch2/envoy-fork.yaml | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 changelog/v1.26.4-patch2/envoy-fork.yaml

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index c8c5290e6..07ab0bb9b 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1,8 +1,10 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        # envoy 1.26.4
-        commit = "cfa32deca25ac57c2bbecdad72807a9b13493fc1",
-        remote = "https://github.com/envoyproxy/envoy",
+        # envoy 1.26.4 forked with extproc changes
+        # sourced from release/v1.26-backportedfork
+        # should go back to upstream once 1.28or wherever the associated prs are merged
+        commit = "f854df5872c0a632774a78537a63d0f6ec4b370b",
+        remote = "https://github.com/solo-io/envoy-fork",
     ),
     inja = dict(
         # Includes unmerged modifications for
diff --git a/changelog/v1.26.4-patch2/envoy-fork.yaml b/changelog/v1.26.4-patch2/envoy-fork.yaml
new file mode 100644
index 000000000..aaa1c2bbe
--- /dev/null
+++ b/changelog/v1.26.4-patch2/envoy-fork.yaml
@@ -0,0 +1,9 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    dependencyRepo: envoy-fork
+    dependencyOwner: solo-io
+    dependencyTag: v1.26.4
+    description: >
+      Migrate to fork that is based off of 1.26.4. It includes long term backports.
+      These backports are not fully merged upstream but make external processing actually function as needed.
+      Notably this implements several long time api notes that were never implemeented before.