Skip to content

Commit

Permalink
update Envoy to v1.23.1
Browse files Browse the repository at this point in the history
Closes projectcontour#4685.

Signed-off-by: Steve Kriss <[email protected]>
  • Loading branch information
skriss committed Aug 29, 2022
1 parent 1f55486 commit 85336df
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/contour/gatewayprovisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
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 @@ -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:
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 @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/render/contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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 | 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 |
Expand Down Expand Up @@ -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
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.23.0"
envoy: "1.23.1"
kubernetes:
- "1.24"
- "1.23"
Expand Down

0 comments on commit 85336df

Please sign in to comment.