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

Fix libbpf submodule checkout in bpftool #2616

Merged
merged 1 commit into from
Jun 28, 2024

Conversation

tpapagian
Copy link
Member

@tpapagian tpapagian commented Jun 28, 2024

Thanks for contributing! Please ensure your pull request adheres to the following guidelines:

  • All commits contain a well written commit message and are signed-off (see Submitting a pull request).
  • All code is covered by unit and/or end-to-end tests where feasible.
  • All generated files are updated if needed (see Making changes).
  • Provide a title or release-note blurb suitable for the release notes (see guidelines).
  • Update documentation and write an upgrade note if needed (see guidelines).
  • Are you a user of Tetragon? Please add yourself to the Users doc in the Cilium repository.

Now in the Dockerfile we do:
git clone --recurse-submodules https://github.com/libbpf/bpftool.git . && git checkout ${BPFTOOL_REV} which means that we fetch the libbpf submodule version of the main branch of bpftool and then we move to the appropriate commit that we need. After the checkout we also need to fetch the correct version of the submodules. This patch fixes that.

Fix libbpf submodule checkout in bpftool when building the tetragon image.

Now in the Dockerfile we do:
git clone --recurse-submodules https://github.com/libbpf/bpftool.git . && git checkout ${BPFTOOL_REV}
which means that we fetch the libbpf submodule version of the main
branch of bpftool and then we move to the appropriate commit that we
need. After the checkout we also need to fetch the correct version of
the submodules. This patch fixes that.

Signed-off-by: Anastasios Papagiannis <[email protected]>
@tpapagian tpapagian requested a review from a team as a code owner June 28, 2024 13:15
@tpapagian tpapagian requested a review from kevsecurity June 28, 2024 13:15
@tpapagian tpapagian added release-note/misc This PR makes changes that have no direct user impact. needs-backport/1.1 This PR needs backporting to 1.1 labels Jun 28, 2024
@tpapagian tpapagian added needs-backport/0.10 needs-backport/1.0 This PR needs backporting to 1.0 labels Jun 28, 2024
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

This is the way

@tpapagian tpapagian merged commit 0235ed5 into main Jun 28, 2024
42 of 48 checks passed
@tpapagian tpapagian deleted the pr/apapag/fix-bpftool-checkout branch June 28, 2024 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-backport/1.0 This PR needs backporting to 1.0 needs-backport/1.1 This PR needs backporting to 1.1 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.

3 participants