diff --git a/Makefile b/Makefile index b7e0c582375..662d596f423 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.24.1 +ENVOY_IMAGE = docker.io/envoyproxy/envoy:v1.25.0 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/changelogs/unreleased/4988-skriss-minor.md b/changelogs/unreleased/4988-skriss-minor.md new file mode 100644 index 00000000000..cf17870bb44 --- /dev/null +++ b/changelogs/unreleased/4988-skriss-minor.md @@ -0,0 +1,4 @@ +## Update Envoy to v1.25.0 + +Bumps Envoy to version 1.25.0. +See Envoy release notes [here](https://www.envoyproxy.io/docs/envoy/v1.25.0/version_history/v1.25/v1.25.0). \ No newline at end of file diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go index 0891bf34e6d..0b76e9e5492 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.24.1", + envoyImage: "docker.io/envoyproxy/envoy:v1.25.0", metricsBindAddress: ":8080", leaderElection: false, leaderElectionID: "0d879e31.projectcontour.io", diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml index a75f1841b82..453004ad9fe 100644 --- a/examples/contour/03-envoy.yaml +++ b/examples/contour/03-envoy.yaml @@ -50,7 +50,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.24.1 + image: docker.io/envoyproxy/envoy:v1.25.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/deployment/03-envoy-deployment.yaml b/examples/deployment/03-envoy-deployment.yaml index 3e404e41dbf..05d3837ed0b 100644 --- a/examples/deployment/03-envoy-deployment.yaml +++ b/examples/deployment/03-envoy-deployment.yaml @@ -63,7 +63,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.24.1 + image: docker.io/envoyproxy/envoy:v1.25.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index d6ce4751623..cb89a68c9a5 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -7391,7 +7391,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.24.1 + image: docker.io/envoyproxy/envoy:v1.25.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 2f06a80798c..5286f317385 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -7384,7 +7384,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.24.1 + image: docker.io/envoyproxy/envoy:v1.25.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index b4572fb24d1..546b84b67e8 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -7378,7 +7378,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.24.1 + image: docker.io/envoyproxy/envoy:v1.25.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md index 73a553554bb..d181f6609e3 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.24.1][24] | 1.26, 1.25, 1.24 | [main][50] | v1alpha2, v1beta1 | +| main | [1.25.0][25] | 1.26, 1.25, 1.24 | [main][50] | v1alpha2, v1beta1 | | 1.23.2 | [1.24.1][24] | 1.25, 1.24, 1.23 | N/A | v1alpha2, v1beta1 | | 1.23.1 | [1.24.1][24] | 1.25, 1.24, 1.23 | N/A | v1alpha2, v1beta1 | | 1.23.0 | [1.24.0][21] | 1.25, 1.24, 1.23 | [1.23.0][74] | v1alpha2, v1beta1 | @@ -132,6 +132,7 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1 [22]: https://www.envoyproxy.io/docs/envoy/v1.22.6/version_history/current [23]: https://www.envoyproxy.io/docs/envoy/v1.23.3/version_history/v1.23/v1.23.3 [24]: https://www.envoyproxy.io/docs/envoy/v1.24.1/version_history/v1.24/v1.24.1 +[25]: https://www.envoyproxy.io/docs/envoy/v1.25.0/version_history/v1.25/v1.25.0 [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 b4c2ffe29ba..fbb287e3816 100644 --- a/versions.yaml +++ b/versions.yaml @@ -7,7 +7,7 @@ versions: - version: main supported: "false" dependencies: - envoy: "1.24.1" + envoy: "1.25.0" kubernetes: - "1.26" - "1.25"