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.

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

[v1.15] images: Update bpftool, checkpatch images #31896

Merged
merged 4 commits into from
Apr 18, 2024

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Apr 11, 2024

Once this PR is merged, a GitHub action will update the labels of these PRs:

 31753

This backport was initially part of #31890, but got tossed out due to the necessity to regenerate the images.

@qmonnet qmonnet added kind/backports This PR provides functionality previously merged into master. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. labels Apr 11, 2024
@qmonnet qmonnet temporarily deployed to release-base-images April 11, 2024 09:04 — with GitHub Actions Inactive
@qmonnet qmonnet temporarily deployed to release-base-images April 11, 2024 09:09 — with GitHub Actions Inactive
@qmonnet
Copy link
Member Author

qmonnet commented Apr 11, 2024

/test-backport-1.15

@qmonnet qmonnet marked this pull request as ready for review April 11, 2024 10:16
@qmonnet qmonnet requested review from a team as code owners April 11, 2024 10:16
@qmonnet qmonnet requested a review from brlbil April 11, 2024 10:16
@tommyp1ckles
Copy link
Contributor

@qmonnet sorry about the description edit, I needed to copy the backport description format from somewhere and I accidentally hit save 😓 Everything should be as it was.

@qmonnet
Copy link
Member Author

qmonnet commented Apr 12, 2024

Ready to merge after TopHat review (and when we have the green light from release managers to merge on v1.15 again).

@qmonnet qmonnet added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 12, 2024
@aditighag aditighag added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 17, 2024
@aditighag
Copy link
Member

@qmonnet The PR needs to be rebased as there are a bunch of conflicts.

@aditighag aditighag removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 17, 2024
[ upstream commit 7a98d56 ]

Update checkpatch image to pull the latest changes we've added: namely,
remove the wrapping of individual patch results in GitHub's workflows
interface, as it's annoying to click many times to find the commits with
issues.

Signed-off-by: Quentin Monnet <qmo@qmon.net>
[ upstream commit f3e65bc ]

We want bpftool to be able to dump netkit programs, let's update the
image with a version that supports it.

Signed-off-by: Quentin Monnet <qmo@qmon.net>
@qmonnet qmonnet force-pushed the pr/qmonnet/1.15-images-update branch from 3fbb37d to 1fb661a Compare April 17, 2024 15:19
@qmonnet qmonnet removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Apr 17, 2024
@qmonnet qmonnet force-pushed the pr/qmonnet/1.15-images-update branch from cfaba19 to 1fb661a Compare April 17, 2024 15:41
@qmonnet qmonnet temporarily deployed to release-base-images April 17, 2024 15:41 — with GitHub Actions Inactive
Signed-off-by: Quentin Monnet <qmo@qmon.net>
@qmonnet qmonnet temporarily deployed to release-base-images April 17, 2024 15:49 — with GitHub Actions Inactive
Signed-off-by: Cilium Imagebot <noreply@cilium.io>
@auto-committer auto-committer bot temporarily deployed to release-base-images April 17, 2024 16:03 Inactive
@qmonnet
Copy link
Member Author

qmonnet commented Apr 17, 2024

/test-backport-1.15

@qmonnet qmonnet added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 18, 2024
@qmonnet
Copy link
Member Author

qmonnet commented Apr 18, 2024

@aditighag Thank you, I rebased and had the images re-generated

@aditighag aditighag merged commit bda8091 into v1.15 Apr 18, 2024
232 checks passed
@aditighag aditighag deleted the pr/qmonnet/1.15-images-update branch April 18, 2024 18:31
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants