Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump envoy to v1.31.0 #6569

Merged
merged 2 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion changelogs/unreleased/6562-sunjayBhatia-small.md

This file was deleted.

1 change: 1 addition & 0 deletions changelogs/unreleased/6569-skriss-small.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updates Envoy to v1.31.0. See the [Envoy release notes](https://www.envoyproxy.io/docs/envoy/v1.31.0/version_history/v1.31/v1.31.0) for more information about the content of the release.
2 changes: 1 addition & 1 deletion cmd/contour/gatewayprovisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/contour/03-envoy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/03-envoy-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/render/contour-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/render/contour-gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/render/contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion site/content/resources/compatibility-matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -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] |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ versions:
- version: main
supported: "false"
dependencies:
envoy: "1.30.4"
envoy: "1.31.0"
kubernetes:
- "1.30"
- "1.29"
Expand Down