Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

images/builder: update proto dependencies #24328

Merged
merged 4 commits into from Apr 21, 2023
Merged

images/builder: update proto dependencies #24328

merged 4 commits into from Apr 21, 2023

Conversation

rolinh
Copy link
Member

@rolinh rolinh commented Mar 13, 2023

See commits for details.

@rolinh rolinh added the release-note/misc This PR makes changes that have no direct user impact. label Mar 13, 2023
@rolinh rolinh temporarily deployed to release-base-images March 13, 2023 10:07 — with GitHub Actions Inactive
@github-actions
Copy link

This pull request has been automatically marked as stale because it
has not had recent activity. It will be closed if no further activity
occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. label Apr 13, 2023
@rolinh rolinh removed the stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. label Apr 18, 2023
@rolinh rolinh temporarily deployed to release-base-images April 18, 2023 13:28 — with GitHub Actions Inactive
@rolinh rolinh marked this pull request as ready for review April 18, 2023 13:57
@rolinh rolinh requested review from a team as code owners April 18, 2023 13:57
@rolinh rolinh requested review from nebril and gandro April 18, 2023 13:57
gandro
gandro approved these changes Apr 19, 2023
View reviewed changes
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

images/builder/install-protoplugins.sh
# c285fc70e095eccc98d79b9a133e1e328141aefd == tag: cmd/protoc-gen-go-grpc/v1.2.0
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@c285fc70e095eccc98d79b9a133e1e328141aefd
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.0
# 8ba23be9613c672d40ae261d2a1335d639bdd59b == tag: cmd/protoc-gen-go-grpc/v1.3.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably could have those be updated by Renovate going forward. It would need a custom regex manager, but it's possible to match git tags to git shas and have Renovate update the sha if the tag changes.

images/builder/install-protoc.sh
@@ -8,7 +8,7 @@ set -o errexit
set -o pipefail
set -o nounset

protoc_version="3.20.1"
protoc_version="22.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also likely possible to automate using Renovate regexes.

@gandro gandro added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 19, 2023
@rolinh rolinh removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 19, 2023
@rolinh rolinh temporarily deployed to release-base-images April 19, 2023 09:43 — with GitHub Actions Inactive
@rolinh rolinh added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 20, 2023
@rolinh
images/builder: name final docker target as 'release'
d24e510 
Naming the final target as `release` was omitted in
fdf4f7e, which prevented `make -C
images cilium-builder` from succeeding.

Fixes: fdf4f7e

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh
images/builder: bump proto plugins
f55be4e 
Release notes for protoc-gen-go-grpc v1.3.0:
https://github.com/grpc/grpc-go/releases/tag/cmd/protoc-gen-go-grpc/v1.3.0

Release notes for cmd/protoc-gen-go v1.29.0:
https://github.com/protocolbuffers/protobuf-go/releases/tag/v1.29.0

Release notes for cmd/protoc-gen-go v1.30.0:
https://github.com/protocolbuffers/protobuf-go/releases/tag/v1.30.0

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh
images/builder: bump protoc to v22.3
e1ef1c5 
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh
images: update cilium-builder
9c5c72d 
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh temporarily deployed to release-base-images April 20, 2023 19:54 — with GitHub Actions Inactive
@rolinh rolinh removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 20, 2023
@rolinh
Copy link
Member Author

rolinh commented Apr 21, 2023

Marking as ready to merge given there is no functional changes in the generated code.

@rolinh rolinh added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 21, 2023
@ldelossa ldelossa merged commit 5103590 into main Apr 21, 2023
45 checks passed
@ldelossa ldelossa deleted the pr/rolinh/builder-update branch April 21, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@nebril nebril nebril approved these changes

Assignees
No one assigned
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rolinh @gandro @nebril @ldelossa