[v2.1.x] bump envoy-gloo to v1.35.6-patch1 (#12683)

Signed-off-by: Andy Fong <[email protected]>

Author: andy-fong

Makefile

@@ -39,7 +39,7 @@ export VERSION
 SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 
 # Note: When bumping this version, update the version in pkg/validator/validator.go as well.
-export ENVOY_IMAGE ?= quay.io/solo-io/envoy-gloo:1.35.2-patch4
+export ENVOY_IMAGE ?= quay.io/solo-io/envoy-gloo:1.35.6-patch1
 export LDFLAGS := -X 'github.com/kgateway-dev/kgateway/v2/internal/version.Version=$(VERSION)'
 export GCFLAGS ?=
 

internal/envoyinit/rustformations/Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 # The SDK version must match the Envoy version due to the strict compatibility requirements.
-envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "2c2cd7efd119a5c9028b68a97d88a540248f8d18" }
+envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "0d240c4b0f5b5db91ef14b1bf424520144b1a75d" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 rand = "0.9.0"

internal/envoyinit/rustformations/Cargo.toml

@@ -13,7 +13,7 @@ import (
 var (
 	defaultEnvoyPath = "/usr/local/bin/envoy"
 	// TODO(tim): avoid hardcoding the envoy image version in multiple places.
-	defaultEnvoyImage = "quay.io/solo-io/envoy-gloo:1.35.2-patch4"
+	defaultEnvoyImage = "quay.io/solo-io/envoy-gloo:1.35.6-patch1"
 )
 
 // ErrInvalidXDS is returned when Envoy rejects the supplied JSON.

pkg/validator/validator.go

@@ -346,7 +346,7 @@ func TestExtractEnvoyError(t *testing.T) {
 		},
 		{
 			name: "docker pull logs present",
-			input: `Unable to find image 'quay.io/solo-io/envoy-gloo:1.35.2-patch4' locally
+			input: `Unable to find image 'quay.io/solo-io/envoy-gloo:1.35.6-patch1' locally
 1.35.2-patch1: Pulling from solo-io/envoy-gloo
 f90c8eb4724c: Pulling fs layer
 9f37c34398c2: Pulling fs layer
@@ -365,16 +365,16 @@ f90c8eb4724c: Pull complete
 1cc4dfe322cb: Pull complete
 e800bbdc2f77: Pull complete
 Digest: sha256:98c645568997299a1c4301e6077a1d2f566bb20828c0739e6c4177a821524dad
-Status: Downloaded newer image for quay.io/solo-io/envoy-gloo:1.35.2-patch4
+Status: Downloaded newer image for quay.io/solo-io/envoy-gloo:1.35.6-patch1
 error initializing configuration '/dev/fd/0': invalid named capture group: (?<=foo)bar`,
 			expected: "error initializing configuration '/dev/fd/0': invalid named capture group: (?<=foo)bar",
 		},
 		{
 			name: "docker pull logs with multi-line error",
-			input: `Unable to find image 'quay.io/solo-io/envoy-gloo:1.35.2-patch4' locally
+			input: `Unable to find image 'quay.io/solo-io/envoy-gloo:1.35.6-patch1' locally
 1.35.2-patch1: Pulling from solo-io/envoy-gloo
 f90c8eb4724c: Pull complete
-Status: Downloaded newer image for quay.io/solo-io/envoy-gloo:1.35.2-patch4
+Status: Downloaded newer image for quay.io/solo-io/envoy-gloo:1.35.6-patch1
 error initializing configuration '/dev/fd/0': missing ]:
   at line 42 in filter configuration
   regex validation failed`,