From 85336df8c2ecc5c9982b3e0d025f42463d54a8ad Mon Sep 17 00:00:00 2001
From: Steve Kriss <krisss@vmware.com>
Date: Mon, 29 Aug 2022 15:00:23 +0000
Subject: [PATCH] update Envoy to v1.23.1

Closes #4685.

Signed-off-by: Steve Kriss <krisss@vmware.com>
---
 Makefile                                       | 2 +-
 cmd/contour/gatewayprovisioner.go              | 2 +-
 examples/contour/03-envoy.yaml                 | 2 +-
 examples/render/contour-gateway.yaml           | 2 +-
 examples/render/contour.yaml                   | 2 +-
 site/content/resources/compatibility-matrix.md | 3 ++-
 versions.yaml                                  | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index df8b73c9108..b134774bb59 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ IMAGE := $(REGISTRY)/$(PROJECT)
 SRCDIRS := ./cmd ./internal ./apis
 LOCAL_BOOTSTRAP_CONFIG = localenvoyconfig.yaml
 SECURE_LOCAL_BOOTSTRAP_CONFIG = securelocalenvoyconfig.yaml
-ENVOY_IMAGE = docker.io/envoyproxy/envoy:v1.23.0
+ENVOY_IMAGE = docker.io/envoyproxy/envoy:v1.23.1
 GATEWAY_API_VERSION ?= $(shell grep "sigs.k8s.io/gateway-api" go.mod | awk '{print $$2}')
 
 # Used to supply a local Envoy docker container an IP to connect to that is running
diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go
index c1089bce8a0..b3b3b6a4150 100644
--- a/cmd/contour/gatewayprovisioner.go
+++ b/cmd/contour/gatewayprovisioner.go
@@ -34,7 +34,7 @@ func registerGatewayProvisioner(app *kingpin.Application) (*kingpin.CmdClause, *
 
 	provisionerConfig := &gatewayProvisionerConfig{
 		contourImage:          "ghcr.io/projectcontour/contour:main",
-		envoyImage:            "docker.io/envoyproxy/envoy:v1.23.0",
+		envoyImage:            "docker.io/envoyproxy/envoy:v1.23.1",
 		metricsBindAddress:    ":8080",
 		leaderElection:        false,
 		leaderElectionID:      "0d879e31.projectcontour.io",
diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml
index 14f135f5873..8fdf1bb68a2 100644
--- a/examples/contour/03-envoy.yaml
+++ b/examples/contour/03-envoy.yaml
@@ -56,7 +56,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.23.0
+        image: docker.io/envoyproxy/envoy:v1.23.1
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml
index 90a45af750e..af99791cd24 100644
--- a/examples/render/contour-gateway.yaml
+++ b/examples/render/contour-gateway.yaml
@@ -5162,7 +5162,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.23.0
+        image: docker.io/envoyproxy/envoy:v1.23.1
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
index 8f34278b0e1..9047034df09 100644
--- a/examples/render/contour.yaml
+++ b/examples/render/contour.yaml
@@ -5157,7 +5157,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.23.0
+        image: docker.io/envoyproxy/envoy:v1.23.1
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md
index a37c909f937..a8afc9f5293 100644
--- a/site/content/resources/compatibility-matrix.md
+++ b/site/content/resources/compatibility-matrix.md
@@ -10,7 +10,7 @@ These combinations of versions are specifically tested in CI and supported by th
 
 | Contour Version | Envoy Version        | Kubernetes Versions | Operator Version | Gateway API Version |
 | --------------- | :------------------- | ------------------- | ---------------- | --------------------|
-| main            | [1.23.0][19]         | 1.24, 1.23, 1.22    | [main][50]       | v1alpha2, v1beta1   |
+| main            | [1.23.1][20]         | 1.24, 1.23, 1.22    | [main][50]       | v1alpha2, v1beta1   |
 | 1.22.0          | [1.23.0][19]         | 1.24, 1.23, 1.22    | [1.22.0][72]     | v1alpha2, v1beta1   |
 | 1.21.1          | [1.22.2][17]         | 1.23, 1.22, 1.21    | [1.21.1][70]     | v1alpha2            |
 | 1.21.0          | [1.22.0][16]         | 1.23, 1.22, 1.21    | [1.21.0][69]     | v1alpha2            |
@@ -119,6 +119,7 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1
 [17]: https://www.envoyproxy.io/docs/envoy/v1.22.2/version_history/current
 [18]: https://www.envoyproxy.io/docs/envoy/v1.21.3/version_history/current
 [19]: https://www.envoyproxy.io/docs/envoy/v1.23.0/version_history/v1.23/v1.23.0
+[20]: https://www.envoyproxy.io/docs/envoy/v1.23.1/version_history/v1.23/v1.23.1
 
 [50]: https://github.com/projectcontour/contour-operator
 [51]: https://github.com/projectcontour/contour-operator/releases/tag/v1.11.0
diff --git a/versions.yaml b/versions.yaml
index 92f2be3382e..4ff9550efa0 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -7,7 +7,7 @@ versions:
   - version: main
     supported: "false"
     dependencies:
-      envoy: "1.23.0"
+      envoy: "1.23.1"
       kubernetes:
         - "1.24"
         - "1.23"