Skip to content

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented May 30, 2024

The builder image contains the 'protoc' binary which can generate
different API files when it's updated, notably because protoc decides to
encode its own version into the files it outputs.

Add a step in the builder image workflow to update the api/v1 files.

Related: #32767 (comment)

@joestringer joestringer added the release-note/misc This PR makes changes that have no direct user impact. label May 30, 2024
@joestringer joestringer requested a review from a team as a code owner May 30, 2024 17:06
@joestringer joestringer requested a review from brlbil May 30, 2024 17:06
@joestringer joestringer temporarily deployed to release-base-images May 30, 2024 17:06 — with GitHub Actions Inactive
@joestringer joestringer marked this pull request as draft May 30, 2024 17:07
@joestringer
Copy link
Member Author

Marking as draft until #32767 goes in, then we can rebase + re-generate the builder image versions since the make script is an input to the builder.

@auto-committer auto-committer bot temporarily deployed to release-base-images May 31, 2024 11:27 Inactive
@joestringer joestringer force-pushed the pr/joe/regenerate-api-from-builder branch from ad42f65 to a0d960e Compare June 3, 2024 09:55
@auto-committer auto-committer bot temporarily deployed to release-base-images June 3, 2024 10:09 Inactive
@joestringer
Copy link
Member Author

/test

@joestringer joestringer force-pushed the pr/joe/regenerate-api-from-builder branch from ff3984a to 697dcfb Compare June 4, 2024 04:35
@auto-committer auto-committer bot temporarily deployed to release-base-images June 4, 2024 04:52 Inactive
@joestringer joestringer force-pushed the pr/joe/regenerate-api-from-builder branch from 43cadb6 to 4a55ab9 Compare June 7, 2024 05:09
@joestringer joestringer force-pushed the pr/joe/regenerate-api-from-builder branch from 4a55ab9 to 890850d Compare June 7, 2024 05:15
@joestringer joestringer temporarily deployed to release-base-images June 7, 2024 05:22 — with GitHub Actions Inactive
@auto-committer auto-committer bot had a problem deploying to release-base-images June 7, 2024 05:39 Error
@joestringer
Copy link
Member Author

New step works in the workflow when testing with pull_request rather than pull_request_target for the workflow: https://github.com/cilium/cilium/actions/runs/9412074812/job/25926379540?pr=32804#step:33:1 . Dropping temporary test commit bcc66f1 .

@joestringer joestringer force-pushed the pr/joe/regenerate-api-from-builder branch from c53a34b to bfbe220 Compare June 7, 2024 05:45
@joestringer joestringer temporarily deployed to release-base-images June 7, 2024 05:45 — with GitHub Actions Inactive
@joestringer
Copy link
Member Author

/test

@joestringer joestringer marked this pull request as ready for review June 7, 2024 05:46
@joestringer joestringer requested review from a team as code owners June 7, 2024 05:46
@joestringer joestringer requested a review from a team as a code owner June 7, 2024 05:46
@joestringer joestringer enabled auto-merge June 7, 2024 05:47
@rolinh rolinh removed request for chancez and borkmann June 7, 2024 07:27
The builder image contains the 'protoc' binary which can generate
different API files when it's updated, notably because protoc decides to
encode its own version into the files it outputs.

Add a step in the builder image update workflow to update the api/v1 files.

Signed-off-by: Joe Stringer <joe@cilium.io>
This error message was copied from the equivalent runtime script. Fix it.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer force-pushed the pr/joe/regenerate-api-from-builder branch from bfbe220 to fbb5b16 Compare June 10, 2024 17:00
Signed-off-by: Cilium Imagebot <noreply@cilium.io>
@auto-committer auto-committer bot temporarily deployed to release-base-images June 10, 2024 17:19 Inactive
@joestringer
Copy link
Member Author

/test

@joestringer joestringer added this pull request to the merge queue Jun 11, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 11, 2024
Merged via the queue into main with commit a1d0307 Jun 11, 2024
@joestringer joestringer deleted the pr/joe/regenerate-api-from-builder branch June 11, 2024 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

4 participants