Upgrade Cilium's eBPF library version to 0.16 #4397
Conversation
rafaelroquetto
force-pushed
the
main
branch
5 times, most recently
from
3d516ee
to
b00d33b
Compare
s/Cilium/Cilium's eBPF library/ |
rafaelroquetto
force-pushed
the
main
branch
from
b00d33b
to
92948b3
Compare
rafaelroquetto
changed the title
rafaelroquetto
force-pushed
the
main
branch
from
f72e3cd
to
978b517
Compare
|
I've pushed two different commits to illustrate the points being discussed, but if everything is accepted, I intend to squash-merge them as a single commit (happy to amend the PR for that). |
There was a problem hiding this comment.
@rafaelroquetto how is this solving a bug? You use the libcontainer module in your program and can't update the cilium dep to that version there due to runc using the old one? Or can you clarify that?
If that is the case, too bad cilium doesn't provide a 1.x release :(
| } | ||
|
|
||
| if useReplaceProg { | ||
| attachProgramOptions.Anchor = link.ReplaceProgram(oldProgs[0]) |
There was a problem hiding this comment.
why not adding the flag too, as it was done before?
There was a problem hiding this comment.
They are now handled by the underlying code and are no longer explicitly allowed. See https://github.com/cilium/ebpf/blob/15d4f245e548eb00383aa88a24da934f0d26fc43/link/program.go#L34
There was a problem hiding this comment.
Thanks. For the next time, pointing this out in the commit/PR makes the review simpler :)
|
@rata you're spont on! We have a situation in which one of our projects (Grafana Beyla) requires fixes from more recent Cilium's eBPF releases (notoriously cilium/ebpf#1348). We then have another project, Grafana Alloy, which depends both on Beyla and runc, and as you correctly guessed, we can't update the cilium dependency. :( |
|
(@wildum can perhaps offer further context) |
|
That's correct, and on a more generic case, I expect all projects that have a dependency to |
|
The breaking change is from cilium/ebpf#1163 and it first appeared in v0.13.0 (which is probably the reason why dependabot never opened a PR to upgrade it). @cyphar PTAL |
|
Please squash commits |
rafaelroquetto
force-pushed
the
main
branch
3 times, most recently
from
d893c36
to
7bf75e1
Compare
|
@AkihiroSuda done |
|
@rafaelroquetto due to #4393 merge (which vendored golang.org/x/sys) this needs a rebase. |
rafaelroquetto
force-pushed
the
main
branch
from
7bf75e1
to
c82711c
Compare
rafaelroquetto
force-pushed
the
main
branch
2 times, most recently
from
e55604b
to
e3a1e1c
Compare
|
@kolyshkin done - interestingly it no longer complains and requires the change from Thank you all again for taking time to review this. |
Signed-off-by: Rafael Roquetto <rafael.roquetto@grafana.com>
rafaelroquetto
force-pushed
the
main
branch
from
e3a1e1c
to
216175a
Compare
|
@kolyshkin @AkihiroSuda would this PR qualify to be cherry-picked on the 1.1 branch? would love to pay down some debt in kubernetes/kubernetes w.r.t dependencies if we can move up to newer cilium |
|
Yes, feel free to submit a cherrypick PR |
1.1 still uses go 1.18, so that would not be simple. As of today, I'd rather release 1.2.0-final out the door (and use it in k8s). |
@kolyshkin that sounds awesome! |
Upgrade the cilium version to 0.16 (latest). There are many important fixes in between (e.g. cilium/ebpf#1348) that would be nice to have downstream.
This PR basically updates the version of the cilium package and its dependencies, and fixes libcontainer/cgroups/devices/ebpf_linux.go to reflext the new API.
Disclaimer: I am not well acquainted with the codebase, so apologies in advance for anything stupid I may be doing.
Resolves: #4396