fix(pkg/driver): fixup kernel headers download #499
Merged
Conversation
This file contains 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
|
/milestone v0.8.0 |
FedeDP
commented
Mar 29, 2024
| out, err := exec.Command("bash", "-c", script).Output() //nolint:gosec // false positive | ||
| path := strings.TrimSuffix(string(out), "\n") | ||
| var path string |
There was a problem hiding this comment.
FedeDP
commented
Mar 29, 2024
| @@ -208,7 +220,12 @@ func Build(ctx context.Context, | |||
| // try to load kernel headers urls from driverkit. | |||
| if _, found := env[drivertype.KernelDirEnv]; !found { | |||
| printer.Logger.Debug("Trying to automatically fetch kernel headers.") | |||
| kernelHeadersPath, cleaner, err := loadKernelHeadersFromDk(d.String(), kr) | |||
| // KernelVersion needs to be fixed up; it is only used by driverkit Ubuntu builder | |||
There was a problem hiding this comment.
|
Bumped to driverkit v0.18.2. |
FedeDP
changed the title
FedeDP
commented
Mar 29, 2024
| // KernelVersion needs to be fixed up; it is only used by driverkit Ubuntu builder | ||
| // and we must ensure that it is correctly set. | ||
| fixedKr := d.FixupKernel(kr) | ||
| kVerFixedKr := kr |
There was a problem hiding this comment.
Don't overwrite kr here, instead use a copy.
There was a problem hiding this comment.
While this is a bit ugly rn, it will be much better once #356 lands.
…kit kernel download script template. Signed-off-by: Federico Di Pierro <[email protected]>
…ad script helper. Signed-off-by: Federico Di Pierro <[email protected]>
FedeDP
force-pushed
the
fix/fixup_kernel_headers_download
branch
from
ed53932 to
70289f4
Compare
leogr
approved these changes
Apr 3, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: FedeDP, leogr The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
What type of PR is this?
/kind bug
/kind cleanup
Any specific area of the project related to this PR?
/area library
What this PR does / why we need it:
This PR fixes the templating of kernel headers download script from driverkit, that needs a fixed up kernelversion (only ubuntu uses it in driverkit, and it must be actually fixed, so that eg:
#26~22.04.1 Ubuntu...becomes26~22.04.1).Moreover, it bumps driverkit to what will become v0.18.2 that contains a fix for new KERNELDIR mechanism (falcosecurity/driverkit#330).
Already in falcoctl main!wipuntil driverkit v0.18.2 is released.Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer: