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

Remove custom iproute2 fork #26221

Merged
merged 5 commits into from Jun 16, 2023
Merged

Remove custom iproute2 fork #26221

merged 5 commits into from Jun 16, 2023

Conversation

ti-mo
Copy link
Contributor

@ti-mo ti-mo commented Jun 14, 2023

Supersedes #26162. (PR from personal fork)

As of Cilium 1.14, it no longer uses the ip command to load BPF programs into the kernel. This means we no longer need to maintain our patches on top of iproute2 and we no longer depend on a custom build in order for Cilium to run.

Remove cilium-iproute2 references from the documentation.

Also remove the contrib/ansible directory that was partly dedicated to building and installing this custom iproute2.

Fixes: #24579.

Remove custom iproute2 fork

@ti-mo ti-mo requested review from a team as code owners June 14, 2023 10:31
@ti-mo ti-mo requested review from nbusseneau and jibi June 14, 2023 10:31
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jun 14, 2023
@ti-mo ti-mo temporarily deployed to release-base-images June 14, 2023 10:31 — with GitHub Actions Inactive
@ti-mo ti-mo changed the title Tb/remove iproute2 fork Remove custom iproute2 fork Jun 14, 2023
@ti-mo ti-mo added the release-note/misc This PR makes changes that have no direct user impact. label Jun 14, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jun 14, 2023
@ti-mo ti-mo added sig/loader Impacts the loading of BPF programs into the kernel. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Jun 14, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Jun 14, 2023
@auto-committer auto-committer bot requested a review from a team as a code owner June 14, 2023 10:55
@auto-committer auto-committer bot temporarily deployed to release-base-images June 14, 2023 10:55 Inactive
@ti-mo ti-mo temporarily deployed to release-base-images June 14, 2023 11:34 — with GitHub Actions Inactive
@auto-committer auto-committer bot temporarily deployed to release-base-images June 14, 2023 12:12 Inactive
@ti-mo
Copy link
Contributor Author

ti-mo commented Jun 14, 2023

/test

@sayboras sayboras added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Jun 15, 2023
Copy link
Contributor

@zacharysarah zacharysarah left a comment

Choose a reason for hiding this comment

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

@ti-mo Good work, only nits to fix. Approving with the understanding that changes are required prior to merge. Also:
Screenshot 2023-06-15 at 6 00 28 PM
My hero. 😻

Documentation/contributing/release/backports.rst Outdated Show resolved Hide resolved
@ti-mo ti-mo temporarily deployed to release-base-images June 16, 2023 09:29 — with GitHub Actions Inactive
@ti-mo
Copy link
Contributor Author

ti-mo commented Jun 16, 2023

@ti-mo Good work, only nits to fix. Approving with the understanding that changes are required prior to merge. Also: Screenshot 2023-06-15 at 6 00 28 PM
My hero. 😻

image

I'm seeing a trend!

@ti-mo
Copy link
Contributor Author

ti-mo commented Jun 16, 2023

/test

This has been unmaintained for years and depends on llvm7, which is unlikely
to work with current versions of Cilium. Remove from the repository.

Signed-off-by: Timo Beckers <timo@isovalent.com>
Also fix a typo in runtime/builder image anchor.

Signed-off-by: Timo Beckers <timo@isovalent.com>
As of Cilium 1.14, it no longer uses the ip command to load BPF programs into
the kernel. This means we no longer need to maintain our patches on top of
iproute2 and we no longer depend on a custom build in order for Cilium to run.

Signed-off-by: Timo Beckers <timo@isovalent.com>
See previous commit, a custom version of iproute2 is no longer required
to run Cilium, and we no longer ship it in the official container images.

Signed-off-by: Timo Beckers <timo@isovalent.com>
@ti-mo ti-mo temporarily deployed to release-base-images June 16, 2023 11:29 — with GitHub Actions Inactive
@borkmann borkmann removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Jun 16, 2023
Signed-off-by: Cilium Imagebot <noreply@cilium.io>
@ti-mo
Copy link
Contributor Author

ti-mo commented Jun 16, 2023

/test

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Nice work!

@ti-mo ti-mo added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 16, 2023
@borkmann borkmann merged commit 277ba6f into main Jun 16, 2023
62 of 63 checks passed
@borkmann borkmann deleted the tb/remove-iproute2-fork branch June 16, 2023 13:43
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. sig/loader Impacts the loading of BPF programs into the kernel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove iproute2 fork
5 participants