envoy: Bump to v1.29 #660

sayboras · 2024-03-23T13:00:48Z

This is a preparation for coming work, also as part of regular BAU maintenance.

sayboras · 2024-03-24T01:31:38Z

/test

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

jrajahalme · 2024-04-08T08:22:37Z

Looks complete to me, should we remove the dont-merge/preview-only label?

patches/0003-tcp_proxy-Add-filter-state-proxy_read_before_connect.patch

patches/0005-Patch-cel-cpp-to-not-break-build.patch

ENVOY_VERSION

WORKSPACE

jrajahalme · 2024-04-09T13:17:36Z

I had to add the following commit for make api to not try to downgrade go dependencies:

commit c9b9511253d52f2ceb6989e78afbf52995cbe400
Author: Jarno Rajahalme <[email protected]>
Date:   Tue Apr 9 15:01:45 2024 +0200

    api: Remove explicit go get in favor of Renovate
    
    We have Renovate updating Go dependencies now, so we do not need to track
    them manually in Makefile.api any more. After this change `make api` does
    not downgrade the dependencies any more.
    
    Signed-off-by: Jarno Rajahalme <[email protected]>
---
 Makefile.api | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Makefile.api b/Makefile.api
index ce454fa5c..8335408b1 100644
--- a/Makefile.api
+++ b/Makefile.api
@@ -110,16 +110,8 @@ cilium-go-targets: $(CILIUM_PROTO_SOURCES) $(ENVOY_API_PROTO_PATH) Makefile.api
 	go mod tidy && go mod vendor
 
 godeps:
-# @envoy//api/bazel/repository_locations.bzl
-	GO111MODULE=on go get go.opentelemetry.io/proto/otlp/common/[email protected]
-	GO111MODULE=on go get github.com/cncf/xds@e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7
-	GO111MODULE=on go get github.com/census-instrumentation/[email protected]
-	GO111MODULE=on go get github.com/envoyproxy/[email protected]
-	GO111MODULE=on go get github.com/prometheus/[email protected]
-# Latest and/or matching cilium/cilium/go.mod:
-	GO111MODULE=on go get google.golang.org/genproto/...@f966b187b2e5
-	GO111MODULE=on go get google.golang.org/protobuf/[email protected]
-	GO111MODULE=on go get google.golang.org/[email protected]
+# We have Renovate updating Go dependencies for us now
+#
 # Have to keep using github.com/golang/[email protected] version of protoc-gen-go to retain grpc
 # plugin support needed by Envoy API protos.
 # - google.golang.org/protobuf version of protoc-gen-go needs a separate protoc plugin for grpc,

jrajahalme · 2024-04-15T14:53:31Z

Made a separate PR for the make api cleanup: #708

Signed-off-by: Tam Mach <[email protected]>

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras · 2024-04-16T13:39:53Z

Full e2e testing is done in upstream cilium/cilium repo #660

Updated: Upstream PR is cilium/cilium#31571

jrajahalme · 2024-04-16T13:58:31Z

Full e2e testing is done in upstream cilium/cilium repo #660

You mean cilium/cilium#31571 :-)

patches/0003-tcp_proxy-Add-filter-state-proxy_read_before_connect.patch

jrajahalme · 2024-04-16T14:15:52Z

3rd commit is mostly empty now that the cert update was merged to main.

sayboras · 2024-04-16T23:43:12Z

3rd commit is mostly empty now that the cert update was merged to main.

Good call, I have removed this commit.

This commit is to adjust our own patches against new upstream version e.g. 1.29. Signed-off-by: Tam Mach <[email protected]>

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <[email protected]>

Relates: envoyproxy/envoy#30802

Just re-run `make api` and commit the changes Signed-off-by: Tam Mach <[email protected]>

Notable upstream PRs: - Clang 17 cilium/proxy#710 - Envoy 1.29.3 cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

This is to make sure our custom patches didn't break any upstream tests. Related: #660 (comment)

Related: #660 (comment)

This is to make sure our custom patches didn't break any upstream tests. Related: #660 (comment)

Related: #660 (comment)

Notable upstream PRs: - Clang 17 cilium/proxy#710 - Envoy 1.29.3 cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras force-pushed the tam/v1.29-upgrade branch 4 times, most recently from 8b0bc28 to eb35be3 Compare March 23, 2024 15:21

sayboras changed the title ~~Tam/v1.29 upgrade~~ envoy: Bump to v1.29 Mar 24, 2024

sayboras added the dont-merge/preview-only DON'T MERGE label Mar 24, 2024

sayboras added a commit to sayboras/cilium that referenced this pull request Mar 24, 2024

envoy: Bump envoy minor version to v1.29.x

4676589

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras mentioned this pull request Mar 24, 2024

envoy: Bump envoy minor version to v1.29.x cilium/cilium#31571

Merged

sayboras added a commit to sayboras/cilium that referenced this pull request Mar 24, 2024

envoy: Bump envoy minor version to v1.29.x

05e6d4d

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras added a commit to sayboras/cilium that referenced this pull request Mar 24, 2024

envoy: Bump envoy minor version to v1.29.x

4f6494d

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras force-pushed the tam/v1.29-upgrade branch from 0de5ff5 to 02c2b3f Compare March 25, 2024 23:49

sayboras force-pushed the tam/v1.29-upgrade branch from 02c2b3f to 0ffbe44 Compare April 2, 2024 23:34

sayboras marked this pull request as ready for review April 3, 2024 01:10

sayboras requested a review from a team as a code owner April 3, 2024 01:10

sayboras requested review from jrajahalme and removed request for a team April 3, 2024 01:10

sayboras force-pushed the tam/v1.29-upgrade branch 2 times, most recently from eba0d13 to 70150ea Compare April 6, 2024 09:44

jrajahalme reviewed Apr 8, 2024

View reviewed changes

patches/0003-tcp_proxy-Add-filter-state-proxy_read_before_connect.patch Outdated Show resolved Hide resolved

jrajahalme reviewed Apr 8, 2024

View reviewed changes

patches/0005-Patch-cel-cpp-to-not-break-build.patch Outdated Show resolved Hide resolved

jrajahalme reviewed Apr 8, 2024

View reviewed changes

ENVOY_VERSION Show resolved Hide resolved

jrajahalme reviewed Apr 8, 2024

View reviewed changes

WORKSPACE Show resolved Hide resolved

envoy: Bump envoy verison to v1.29.3

b8a9079

Signed-off-by: Tam Mach <[email protected]>

sayboras force-pushed the tam/v1.29-upgrade branch 2 times, most recently from a77b0be to b07d5f5 Compare April 16, 2024 11:09

sayboras added a commit to sayboras/cilium that referenced this pull request Apr 16, 2024

envoy: Bump envoy minor version to v1.29.x

00a1cd0

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras added a commit to sayboras/cilium that referenced this pull request Apr 16, 2024

envoy: Bump envoy minor version to v1.29.x

382f6cc

Relates: cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras requested a review from jrajahalme April 16, 2024 12:32

jrajahalme requested changes Apr 16, 2024

View reviewed changes

patches/0003-tcp_proxy-Add-filter-state-proxy_read_before_connect.patch Show resolved Hide resolved

sayboras force-pushed the tam/v1.29-upgrade branch from b07d5f5 to a20f4ad Compare April 16, 2024 23:41

sayboras requested a review from jrajahalme April 16, 2024 23:44

sayboras removed the dont-merge/preview-only DON'T MERGE label Apr 16, 2024

sayboras added 5 commits April 17, 2024 21:22

cilium: Adjust cilium patches

3e0399a

This commit is to adjust our own patches against new upstream version e.g. 1.29. Signed-off-by: Tam Mach <[email protected]>

patches: Add upstream patch for google CEL CPP

9611089

cilium: Adjust custom filter implementation

66a7b0c

Relates: envoyproxy/envoy#30765 Relates: envoyproxy/envoy#31189 Signed-off-by: Tam Mach <[email protected]>

api: Rename @com_github_cncf_udpa to @com_github_cncf_xds

e192b3e

Relates: envoyproxy/envoy#30802

Update Envoy API

abf0c29

Just re-run `make api` and commit the changes Signed-off-by: Tam Mach <[email protected]>

sayboras force-pushed the tam/v1.29-upgrade branch from a20f4ad to abf0c29 Compare April 17, 2024 11:24

jrajahalme approved these changes Apr 17, 2024

View reviewed changes

jrajahalme added this pull request to the merge queue Apr 17, 2024

Merged via the queue into cilium:main with commit 4f56982 Apr 17, 2024
5 checks passed

sayboras deleted the tam/v1.29-upgrade branch April 18, 2024 10:06

sayboras added a commit to sayboras/cilium that referenced this pull request Apr 18, 2024

envoy: Bump envoy minor version to v1.29.x

697d051

Notable upstream PRs: - Clang 17 cilium/proxy#710 - Envoy 1.29.3 cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras added a commit to sayboras/cilium that referenced this pull request Apr 18, 2024

envoy: Bump envoy minor version to v1.29.x

c4e2259

Notable upstream PRs: - Clang 17 cilium/proxy#710 - Envoy 1.29.3 cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

sayboras added a commit that referenced this pull request Apr 18, 2024

test: Run upstream tcp_proxy_integration_test

8e1f2f1

This is to make sure our custom patches didn't break any upstream tests. Related: #660 (comment)

sayboras added a commit that referenced this pull request Apr 18, 2024

docs: Add envoy.bazelrc sync step in UPGRADE_ENVOY.md

ff23fb6

Related: #660 (comment)

github-merge-queue bot pushed a commit that referenced this pull request Apr 18, 2024

test: Run upstream tcp_proxy_integration_test

7819373

This is to make sure our custom patches didn't break any upstream tests. Related: #660 (comment)

github-merge-queue bot pushed a commit that referenced this pull request Apr 18, 2024

docs: Add envoy.bazelrc sync step in UPGRADE_ENVOY.md

f4ba8c2

Related: #660 (comment)

sayboras added a commit to sayboras/cilium that referenced this pull request Apr 18, 2024

envoy: Bump envoy minor version to v1.29.x

5e0475c

Notable upstream PRs: - Clang 17 cilium/proxy#710 - Envoy 1.29.3 cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

github-merge-queue bot pushed a commit to cilium/cilium that referenced this pull request Apr 22, 2024

envoy: Bump envoy minor version to v1.29.x

fdd6962

Notable upstream PRs: - Clang 17 cilium/proxy#710 - Envoy 1.29.3 cilium/proxy#660 Signed-off-by: Tam Mach <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

envoy: Bump to v1.29 #660

envoy: Bump to v1.29 #660

sayboras commented Mar 23, 2024 •

edited

Loading

sayboras commented Mar 24, 2024

jrajahalme commented Apr 8, 2024

jrajahalme commented Apr 9, 2024

jrajahalme commented Apr 15, 2024

sayboras commented Apr 16, 2024 •

edited

Loading

jrajahalme commented Apr 16, 2024

jrajahalme commented Apr 16, 2024

sayboras commented Apr 16, 2024

envoy: Bump to v1.29 #660

envoy: Bump to v1.29 #660

Conversation

sayboras commented Mar 23, 2024 • edited Loading

sayboras commented Mar 24, 2024

jrajahalme commented Apr 8, 2024

jrajahalme commented Apr 9, 2024

jrajahalme commented Apr 15, 2024

sayboras commented Apr 16, 2024 • edited Loading

jrajahalme commented Apr 16, 2024

jrajahalme commented Apr 16, 2024

sayboras commented Apr 16, 2024

sayboras commented Mar 23, 2024 •

edited

Loading

sayboras commented Apr 16, 2024 •

edited

Loading