bump Envoy to v1.29.0 (#6123)

* bump Envoy to v1.29.0 * bump go-control-plane Signed-off-by: Steve Kriss <stephen.kriss@gmail.com>
projectcontour · Jan 29, 2024 · 6ef905a · 6ef905a
1 parent 4619e0a
commit 6ef905a
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 18 deletions.
diff --git 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.28.0
+ENVOY_IMAGE = docker.io/envoyproxy/envoy:v1.29.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/6123-skriss-small.md b/changelogs/unreleased/6123-skriss-small.md
@@ -0,0 +1 @@
+Updates Envoy to v1.29.0. See the release notes [here](https://www.envoyproxy.io/docs/envoy/v1.29.0/version_history/v1.29/v1.29.0).
diff --git 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.28.0",
+		envoyImage:            "docker.io/envoyproxy/envoy:v1.29.0",
 		metricsBindAddress:    ":8080",
 		leaderElection:        false,
 		leaderElectionID:      "0d879e31.projectcontour.io",

diff --git 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.28.0
+        image: docker.io/envoyproxy/envoy:v1.29.0
         imagePullPolicy: IfNotPresent
         name: envoy
         env:

diff --git 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.28.0
+          image: docker.io/envoyproxy/envoy:v1.29.0
           imagePullPolicy: IfNotPresent
           name: envoy
           env:

diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml
@@ -9155,7 +9155,7 @@ spec:
             - --log-level info
           command:
             - envoy
-          image: docker.io/envoyproxy/envoy:v1.28.0
+          image: docker.io/envoyproxy/envoy:v1.29.0
           imagePullPolicy: IfNotPresent
           name: envoy
           env:

diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml
@@ -9145,7 +9145,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.28.0
+        image: docker.io/envoyproxy/envoy:v1.29.0
         imagePullPolicy: IfNotPresent
         name: envoy
         env:

diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
@@ -9142,7 +9142,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.28.0
+        image: docker.io/envoyproxy/envoy:v1.29.0
         imagePullPolicy: IfNotPresent
         name: envoy
         env:

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/cert-manager/cert-manager v1.13.3
 	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.12.0
+	github.com/envoyproxy/go-control-plane v0.12.1-0.20240111020705-5401a878d8bb
 	github.com/go-logr/logr v1.4.1
 	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
@@ -99,8 +99,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.12.0 h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI=
-github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0=
+github.com/envoyproxy/go-control-plane v0.12.1-0.20240111020705-5401a878d8bb h1:1BlzJS6JUqCF+HY7RLLafmZdZPmpHLvUWZSw8Jz+GcM=
+github.com/envoyproxy/go-control-plane v0.12.1-0.20240111020705-5401a878d8bb/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0=
 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
@@ -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.28.0][45]         | 1.29, 1.28, 1.27    | [1.0.0][110]        |
+| main            | [1.29.0][46]         | 1.29, 1.28, 1.27    | [1.0.0][110]        |
 | 1.27.0          | [1.28.0][45]         | 1.28, 1.27, 1.26    | [0.8.1][109]        |
 | 1.26.1          | [1.27.2][42]         | 1.28, 1.27, 1.26    | [0.8.1][109]        |
 | 1.26.0          | [1.27.0][41]         | 1.28, 1.27, 1.26    | [0.8.0][108]        |
@@ -87,14 +87,14 @@ Contour requires the following Envoy extensions.
 If you are using the image recommended in our [example deployment][1] no action is required.
 If you are providing your own Envoy it must be compiled with the following extensions:
 
-- Access Loggers: 
+- Access Loggers:
   - envoy.access_loggers.file
   - envoy.access_loggers.http_grpc
   - envoy.access_loggers.tcp_grpc
-  
+
 - Compression:
   - envoy.compression.gzip.compressor
-    
+
 - HTTP Filters:
   - envoy.filters.http.compressor
   - envoy.filters.http.cors
@@ -104,7 +104,7 @@ If you are providing your own Envoy it must be compiled with the following exten
   - envoy.filters.http.health_check
   - envoy.filters.http.lua
   - envoy.filters.http.router
-   
+
 - Listener filters
   - envoy.filters.listener.http_inspector
   - envoy.filters.listener.original_dst
@@ -116,11 +116,11 @@ If you are providing your own Envoy it must be compiled with the following exten
   - envoy.filters.network.ext_authz
   - envoy.filters.network.http_connection_manager
   - envoy.filters.network.tcp_proxy
-  
+
 - Transport sockets
   - envoy.transport_sockets.upstream_proxy_protocol
   - envoy.transport_sockets.raw_buffer
-  
+
 - Http Upstreams
   - envoy.upstreams.http.http
   - envoy.upstreams.http.tcp
@@ -174,6 +174,7 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1
 [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
+[46]: https://www.envoyproxy.io/docs/envoy/v1.29.0/version_history/v1.29/v1.29.0
 
 [98]: https://github.com/kubernetes/client-go
 [99]: https://github.com/kubernetes/client-go#compatibility-matrix

diff --git a/versions.yaml b/versions.yaml
@@ -7,7 +7,7 @@ versions:
   - version: main
     supported: "false"
     dependencies:
-      envoy: "1.28.0"
+      envoy: "1.29.0"
       kubernetes:
         - "1.29"
         - "1.28"