Remove dependency from cilium-cli onto pkg/datapath and github.com/cilium/ebpf
#38364
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's unused since commit cc676c7 ("bpf: replace BPF_MAP_UPDATE_ELEM syscall with ebpf-go"). Signed-off-by: Tobias Klauser <tobias@cilium.io>
Otherwise we get build errors on darwin when updating cilium/ebpf beyond v0.17.1. Signed-off-by: Tobias Klauser <tobias@cilium.io>
This reverts commit 03a2d94. Reason for revert: the dependency on pkg/datapath and thus github.com/cilium/ebpf on non-Linux platform was removed by successive commits. Signed-off-by: Tobias Klauser <tobias@cilium.io>
|
/test |
gentoo-root
reviewed
Mar 20, 2025
gentoo-root
approved these changes
Mar 20, 2025
michi-covalent
approved these changes
Mar 20, 2025
derailed
approved these changes
Mar 20, 2025
joestringer
approved these changes
Mar 20, 2025
Good call. Added the |
marseel
approved these changes
Mar 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stub out
metrics.enableIfIndexMetricson all non-Linux platforms to cut the dependency onpkg/datapathand transitively ongithub.com/cilium/ebpf. Without this change the build fails e.g. forGOOS=darwinin the case of cilium-cli when updating cilium/ebpf beyond v0.17.1.With the above fixed, revert the cilium/ebpf downgrade to v0.17.3, see #38334.
Also remove the unused
Errno2Outcomehelper function.Fixes #37598
The dependency graph was generated using the following command:
The resulting image is attached.