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

update Envoy to v1.25.0 #4988

Merged
merged 2 commits into from
Jan 18, 2023
Merged
Changes from 1 commit
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
Next Next commit
update Envoy to v1.25.0
Closes #4739.

Signed-off-by: Steve Kriss <[email protected]>
skriss committed Jan 18, 2023
commit cc3b78732d27b7bdc87fd625eb57c82e006ec4fe
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion cmd/contour/gatewayprovisioner.go
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion examples/contour/03-envoy.yaml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion examples/deployment/03-envoy-deployment.yaml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion examples/render/contour-deployment.yaml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion examples/render/contour-gateway.yaml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion examples/render/contour.yaml
Original file line number Diff line number Diff line change
@@ -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:
3 changes: 2 additions & 1 deletion site/content/resources/compatibility-matrix.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ versions:
- version: main
supported: "false"
dependencies:
envoy: "1.24.1"
envoy: "1.25.0"
kubernetes:
- "1.26"
- "1.25"