From 6f6c0f46c12e31560fc1450516879937f50d2dfd Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia <5337253+sunjayBhatia@users.noreply.github.com> Date: Fri, 10 Jan 2025 08:48:20 -0500 Subject: [PATCH] Bump envoy to 1.32.3 and use go-control-plane/envoy versioned module for APIs (#6841) Also bumps go-control-plane root module to 1.13.4 Signed-off-by: Sunjay Bhatia --- changelogs/unreleased/6714-tsaarni-small.md | 1 - changelogs/unreleased/6841-sunjayBhatia-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 | 5 +++-- go.sum | 10 ++++++---- site/content/resources/compatibility-matrix.md | 3 ++- versions.yaml | 2 +- 12 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 changelogs/unreleased/6714-tsaarni-small.md create mode 100644 changelogs/unreleased/6841-sunjayBhatia-small.md diff --git a/changelogs/unreleased/6714-tsaarni-small.md b/changelogs/unreleased/6714-tsaarni-small.md deleted file mode 100644 index 7628057f739..00000000000 --- a/changelogs/unreleased/6714-tsaarni-small.md +++ /dev/null @@ -1 +0,0 @@ -Updates Envoy to v1.32.0. See the [Envoy release notes](https://www.envoyproxy.io/docs/envoy/v1.32.0/version_history/v1.32/v1.32.0) for more information about the content of the release. diff --git a/changelogs/unreleased/6841-sunjayBhatia-small.md b/changelogs/unreleased/6841-sunjayBhatia-small.md new file mode 100644 index 00000000000..e6ce6924594 --- /dev/null +++ b/changelogs/unreleased/6841-sunjayBhatia-small.md @@ -0,0 +1 @@ +Updates Envoy to v1.32.3. See the [Envoy release notes](https://www.envoyproxy.io/docs/envoy/v1.32.3/version_history/v1.32/v1.32.3) for more information about the content of the release. diff --git a/cmd/contour/gatewayprovisioner.go b/cmd/contour/gatewayprovisioner.go index efc0816b21f..d72e40142f6 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.32.0", + envoyImage: "docker.io/envoyproxy/envoy:v1.32.3", metricsBindAddress: ":8080", leaderElection: false, leaderElectionID: "0d879e31.projectcontour.io", diff --git a/examples/contour/03-envoy.yaml b/examples/contour/03-envoy.yaml index b9c71f39ba8..c9e824f1b34 100644 --- a/examples/contour/03-envoy.yaml +++ b/examples/contour/03-envoy.yaml @@ -46,7 +46,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.32.0 + image: docker.io/envoyproxy/envoy:v1.32.3 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/deployment/03-envoy-deployment.yaml b/examples/deployment/03-envoy-deployment.yaml index 265e70e844e..2480e8390b0 100644 --- a/examples/deployment/03-envoy-deployment.yaml +++ b/examples/deployment/03-envoy-deployment.yaml @@ -58,7 +58,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.32.0 + image: docker.io/envoyproxy/envoy:v1.32.3 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 71eb34a9fb5..0e8d06e472f 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -9369,7 +9369,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.32.0 + image: docker.io/envoyproxy/envoy:v1.32.3 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 59f7415abd5..c559d41b89b 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -9173,7 +9173,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.32.0 + image: docker.io/envoyproxy/envoy:v1.32.3 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index 3ec500870a1..3f17a9dcb02 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -9357,7 +9357,7 @@ spec: - --log-level info command: - envoy - image: docker.io/envoyproxy/envoy:v1.32.0 + image: docker.io/envoyproxy/envoy:v1.32.3 imagePullPolicy: IfNotPresent name: envoy env: diff --git a/go.mod b/go.mod index 5ce8690547b..0b7be06e856 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,8 @@ require ( github.com/cert-manager/cert-manager v1.16.2 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/distribution/reference v0.6.0 - github.com/envoyproxy/go-control-plane v0.13.1 + github.com/envoyproxy/go-control-plane v0.13.4 + github.com/envoyproxy/go-control-plane/envoy v1.32.3 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/google/go-github/v48 v48.2.0 @@ -56,11 +57,11 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/campoy/embedmd v1.0.0 // indirect - github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chigopher/pathlib v0.19.1 // indirect github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect + github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 // indirect github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/fatih/color v1.18.0 // indirect diff --git a/go.sum b/go.sum index 0342030ceb8..677386b0050 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,6 @@ github.com/bombsimon/logrusr/v4 v4.1.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhO github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY= github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= -github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/cert-manager/cert-manager v1.16.2 h1:c9UU2E+8XWGruyvC/mdpc1wuLddtgmNr8foKdP7a8Jg= github.com/cert-manager/cert-manager v1.16.2/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -100,8 +98,12 @@ 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.13.1 h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE= -github.com/envoyproxy/go-control-plane v0.13.1/go.mod h1:X45hY0mufo6Fd0KW3rqsGvQMw58jvjymeCzBU3mWyHw= +github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= +github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA= +github.com/envoyproxy/go-control-plane/envoy v1.32.3 h1:hVEaommgvzTjTd4xCaFd+kEQ2iYBtGxP6luyLrx6uOk= +github.com/envoyproxy/go-control-plane/envoy v1.32.3/go.mod h1:F6hWupPfh75TBXGKA++MCT/CZHFq5r9/uwt/kQYkZfE= +github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI= +github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md index 5d5ce46e743..98af4895bad 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 | Gateway API Version | | --------------- | :------------------- | ------------------- | --------------------| -| main | [1.32.0][65] | 1.32, 1.31, 1.30 | [1.2.1][112] | +| main | [1.32.3][66] | 1.32, 1.31, 1.30 | [1.2.1][112] | | 1.30.1 | [1.31.3][64] | 1.30, 1.29, 1.28 | [1.1.0][111] | | 1.30.0 | [1.31.0][60] | 1.30, 1.29, 1.28 | [1.1.0][111] | | 1.29.3 | [1.30.7][63] | 1.29, 1.28, 1.27 | [1.0.0][110] | @@ -214,6 +214,7 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1 [63]: https://www.envoyproxy.io/docs/envoy/v1.30.7/version_history/v1.30/v1.30 [64]: https://www.envoyproxy.io/docs/envoy/v1.31.3/version_history/v1.31/v1.31 [65]: https://www.envoyproxy.io/docs/envoy/v1.32.0/version_history/v1.32/v1.32 +[66]: https://www.envoyproxy.io/docs/envoy/v1.32.3/version_history/v1.32/v1.32.3 [98]: https://github.com/kubernetes/client-go [99]: https://github.com/kubernetes/client-go#compatibility-matrix diff --git a/versions.yaml b/versions.yaml index 8cac8571c46..140dce6696c 100644 --- a/versions.yaml +++ b/versions.yaml @@ -7,7 +7,7 @@ versions: - version: main supported: "false" dependencies: - envoy: "1.32.0" + envoy: "1.32.3" kubernetes: - "1.32" - "1.31"