Skip to content

Commit

Permalink
update Envoy to 1.28.0 (#5870)
Browse files Browse the repository at this point in the history
* update Envoy to 1.28.0
* bump go-control-plane to 6e4589f570e19a3d17087cf80d40bacdc6356de6

Closes #5680.

Signed-off-by: Steve Kriss <[email protected]>
  • Loading branch information
skriss authored Oct 19, 2023
1 parent 442cf01 commit 57c1ce8
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 13 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.27.2
ENVOY_IMAGE = docker.io/envoyproxy/envoy:v1.28.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
Expand Down
1 change: 0 additions & 1 deletion changelogs/unreleased/5863-sunjayBhatia-small.md

This file was deleted.

1 change: 1 addition & 0 deletions changelogs/unreleased/5870-skriss-small.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updates Envoy to v1.28.0. See the release notes [here](https://www.envoyproxy.io/docs/envoy/v1.28.0/version_history/v1.28/v1.28.0).
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.27.2",
envoyImage: "docker.io/envoyproxy/envoy:v1.28.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 @@ -50,7 +50,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.27.2
image: docker.io/envoyproxy/envoy:v1.28.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 @@ -63,7 +63,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.27.2
image: docker.io/envoyproxy/envoy:v1.28.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 @@ -8736,7 +8736,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.27.2
image: docker.io/envoyproxy/envoy:v1.28.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 @@ -8726,7 +8726,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.27.2
image: docker.io/envoyproxy/envoy:v1.28.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 @@ -8723,7 +8723,7 @@ spec:
- --log-level info
command:
- envoy
image: docker.io/envoyproxy/envoy:v1.27.2
image: docker.io/envoyproxy/envoy:v1.28.0
imagePullPolicy: IfNotPresent
name: envoy
env:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/cert-manager/cert-manager v1.13.1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/distribution/reference v0.5.0
github.com/envoyproxy/go-control-plane v0.11.1
github.com/envoyproxy/go-control-plane v0.11.2-0.20231019082134-6e4589f570e1
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v48 v48.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=
github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
github.com/envoyproxy/go-control-plane v0.11.2-0.20231019082134-6e4589f570e1 h1:i/XN+pZrv2iM+Czc4o4tP6UzUJoOxjNI9gQdE1vIjd0=
github.com/envoyproxy/go-control-plane v0.11.2-0.20231019082134-6e4589f570e1/go.mod h1:3X10o7QcAVxP4y/hnTLgkXLwuZV2DxAEh6uaYD5PoxI=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
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.27.2][42] | 1.28, 1.27, 1.26 | N/A | [0.8.1][109] |
| main | [1.28.0][45] | 1.28, 1.27, 1.26 | N/A | [0.8.1][109] |
| 1.26.1 | [1.27.2][42] | 1.28, 1.27, 1.26 | N/A | [0.8.1][109] |
| 1.26.0 | [1.27.0][41] | 1.28, 1.27, 1.26 | N/A | [0.8.0][108] |
| 1.25.3 | [1.26.6][43] | 1.27, 1.26, 1.25 | N/A | [0.6.2][107] |
Expand Down Expand Up @@ -172,6 +172,7 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1
[42]: https://www.envoyproxy.io/docs/envoy/v1.27.2/version_history/v1.27/v1.27.2
[43]: https://www.envoyproxy.io/docs/envoy/v1.26.6/version_history/v1.26/v1.26.6
[44]: https://www.envoyproxy.io/docs/envoy/v1.25.11/version_history/v1.25/v1.25.11
[45]: https://www.envoyproxy.io/docs/envoy/v1.28.0/version_history/v1.28/v1.28.0

[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.27.2"
envoy: "1.28.0"
kubernetes:
- "1.28"
- "1.27"
Expand Down

0 comments on commit 57c1ce8

Please sign in to comment.