From 57c1ce886d5d1e6112782398f2b7edb842bb8e00 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Thu, 19 Oct 2023 14:17:46 -0600 Subject: [PATCH] update Envoy to 1.28.0 (#5870) * update Envoy to 1.28.0 * bump go-control-plane to 6e4589f570e19a3d17087cf80d40bacdc6356de6 Closes #5680. Signed-off-by: Steve Kriss --- Makefile | 2 +- changelogs/unreleased/5863-sunjayBhatia-small.md | 1 - changelogs/unreleased/5870-skriss-small.md | 1 + cmd/contour/gatewayprovisioner.go | 2 +- examples/contour/03-envoy.yaml | 2 +- examples/deployment/03-envoy-deployment.yaml | 2 +- examples/render/contour-deployment.yaml | 2 +- examples/render/contour-gateway.yaml | 2 +- examples/render/contour.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- site/content/resources/compatibility-matrix.md | 3 ++- versions.yaml | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 changelogs/unreleased/5863-sunjayBhatia-small.md create mode 100644 changelogs/unreleased/5870-skriss-small.md diff --git a/Makefile b/Makefile index c9e2fb8a9c6..7147dd93579 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.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 diff --git a/changelogs/unreleased/5863-sunjayBhatia-small.md b/changelogs/unreleased/5863-sunjayBhatia-small.md deleted file mode 100644 index 6441a67198a..00000000000 --- a/changelogs/unreleased/5863-sunjayBhatia-small.md +++ /dev/null @@ -1 +0,0 @@ -Updates Envoy to v1.27.2. See the release notes for v1.27.1 [here](https://www.envoyproxy.io/docs/envoy/v1.27.1/version_history/v1.27/v1.27.1) and v1.27.2 [here](https://www.envoyproxy.io/docs/envoy/v1.27.2/version_history/v1.27/v1.27.2). diff --git a/changelogs/unreleased/5870-skriss-small.md b/changelogs/unreleased/5870-skriss-small.md new file mode 100644 index 00000000000..85545669e93 --- /dev/null +++ b/changelogs/unreleased/5870-skriss-small.md @@ -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). diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go index cfcbd77857a..24cfc4fd891 100644 --- a/cmd/contour/gatewayprovisioner.go +++ b/cmd/contour/gatewayprovisioner.go @@ -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", diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml index aab46d9b276..908201b05f7 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.27.2 + image: docker.io/envoyproxy/envoy:v1.28.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/deployment/03-envoy-deployment.yaml b/examples/deployment/03-envoy-deployment.yaml index 9e48a7e7038..2976997fb64 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.27.2 + image: docker.io/envoyproxy/envoy:v1.28.0 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 18fab7f0adf..52f38741ac6 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -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: diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 2dccfd92371..7c04958013c 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -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: diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index d1e47c9fecb..53ca1b2b248 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -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: diff --git a/go.mod b/go.mod index 6f378412254..7f1fe195a82 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 4ae0b53e4cc..1f3babd835d 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md index b91b307f339..035dec97855 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.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] | @@ -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 diff --git a/versions.yaml b/versions.yaml index fd8ec1d6e91..2d47ed428e4 100644 --- a/versions.yaml +++ b/versions.yaml @@ -7,7 +7,7 @@ versions: - version: main supported: "false" dependencies: - envoy: "1.27.2" + envoy: "1.28.0" kubernetes: - "1.28" - "1.27"