From c29c42c7a510ee4ff34402a9e0274f7657988ca4 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Fri, 19 Jul 2024 14:52:49 -0600 Subject: [PATCH] bump envoy to v1.31.0 Signed-off-by: Steve Kriss --- cmd/contour/gatewayprovisioner.go | 2 +- examples/contour/03-envoy.yaml | 2 +- examples/deployment/03-envoy-deployment.yaml | 2 +- examples/render/contour-deployment.yaml | 2 +- examples/render/contour-gateway.yaml | 2 +- examples/render/contour.yaml | 2 +- site/content/resources/compatibility-matrix.md | 3 ++- versions.yaml | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go index ffeb7a04880..1fb1b562ec2 100644 --- a/cmd/contour/gatewayprovisioner.go +++ b/cmd/contour/gatewayprovisioner.go @@ -36,7 +36,7 @@ func registerGatewayProvisioner(app *kingpin.Application) (*kingpin.CmdClause, * provisionerConfig := &gatewayProvisionerConfig{ contourImage: "ghcr.io/projectcontour/contour:main", - envoyImage: "docker.io/envoyproxy/envoy:v1.30.4", + envoyImage: "docker.io/envoyproxy/envoy:v1.31.0", metricsBindAddress: ":8080", leaderElection: false, leaderElectionID: "0d879e31.projectcontour.io", diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml index a42adf95623..e8f09596f0f 100644 --- a/examples/contour/03-envoy.yaml +++ b/examples/contour/03-envoy.yaml @@ -46,7 +46,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.4 + image: docker.io/envoyproxy/envoy:v1.31.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/deployment/03-envoy-deployment.yaml b/examples/deployment/03-envoy-deployment.yaml index 50f0f7e0361..9b0f8770cf8 100644 --- a/examples/deployment/03-envoy-deployment.yaml +++ b/examples/deployment/03-envoy-deployment.yaml @@ -58,7 +58,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.4 + image: docker.io/envoyproxy/envoy:v1.31.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 7b33922c22f..edfe5756ea6 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -9265,7 +9265,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.4 + image: docker.io/envoyproxy/envoy:v1.31.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index b670bdece9a..067df730e44 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -9069,7 +9069,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.4 + image: docker.io/envoyproxy/envoy:v1.31.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index 5ac9a95946b..49cd4749a20 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -9253,7 +9253,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.30.4 + image: docker.io/envoyproxy/envoy:v1.31.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md index fbc6845bff2..6cde6dfaa3d 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 | Gateway API Version | | --------------- | :------------------- | ------------------- | --------------------| -| main | [1.30.4][59] | 1.30, 1.29, 1.28 | [1.1.0][111] | +| main | [1.31.0][60] | 1.30, 1.29, 1.28 | [1.1.0][111] | | 1.29.1 | [1.30.2][56] | 1.29, 1.28, 1.27 | [1.0.0][110] | | 1.29.0 | [1.30.1][53] | 1.29, 1.28, 1.27 | [1.0.0][110] | | 1.28.5 | [1.29.5][57] | 1.29, 1.28, 1.27 | [1.0.0][110] | @@ -202,6 +202,7 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1 [57]: https://www.envoyproxy.io/docs/envoy/v1.29.5/version_history/v1.29/v1.29.5 [58]: https://www.envoyproxy.io/docs/envoy/v1.28.4/version_history/v1.28/v1.28.4 [59]: https://www.envoyproxy.io/docs/envoy/v1.30.4/version_history/v1.30/v1.30.4 +[60]: https://www.envoyproxy.io/docs/envoy/v1.31.0/version_history/v1.31/v1.31.0 [98]: https://github.com/kubernetes/client-go [99]: https://github.com/kubernetes/client-go#compatibility-matrix diff --git a/versions.yaml b/versions.yaml index 6bfdd63af58..b0749fcbd66 100644 --- a/versions.yaml +++ b/versions.yaml @@ -7,7 +7,7 @@ versions: - version: main supported: "false" dependencies: - envoy: "1.30.4" + envoy: "1.31.0" kubernetes: - "1.30" - "1.29"