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(pkg/driverbuilder): fixed local cmd build up using os.Environ(). #319

Merged
merged 2 commits into from
Feb 28, 2024

Conversation

FedeDP
Copy link
Contributor

@FedeDP FedeDP commented Feb 14, 2024

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area pkg

What this PR does / why we need it:

Moreover, properly mount debugfs before attempting the bpf probe build if needed.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Moreover, properly mount debugfs before attempting the bpf probe build if needed.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@@ -59,6 +59,12 @@ modinfo {{ .ModuleFullPath }}

{{ if .BuildProbe }}
echo "* Building eBPF probe"

if [ ! -d /sys/kernel/debug/tracing ]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If needed, mount debugfs before locally building the probe.

@@ -128,6 +128,7 @@ func (lbp *LocalBuildProcessor) Start(b *builder.Build) error {
ctx, cancelFunc := context.WithTimeout(context.Background(), time.Duration(lbp.timeout)*time.Second)
defer cancelFunc()
cmd := exec.CommandContext(ctx, "/bin/bash", "-c", driverkitScript)
cmd.Env = os.Environ()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If cmd.Env is not empty when running the cmd, it won't get auto-filled with Environ. Force fill before appending our env map.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@poiana poiana added size/XXL and removed size/XS labels Feb 14, 2024
Copy link
Contributor

@EXONER4TED EXONER4TED left a comment

Choose a reason for hiding this comment

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

/approve

@poiana
Copy link

poiana commented Feb 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EXONER4TED, FedeDP

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit eacaee8 into master Feb 28, 2024
4 of 5 checks passed
@poiana poiana deleted the fix/local_cmd_environ branch February 28, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants