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.

Sign up for GitHub

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

Jump to bottom

libcontainer/apparmor: use sync.Once for AppArmor detection #2852

Merged
merged 1 commit into from
Mar 21, 2021
Merged

libcontainer/apparmor: use sync.Once for AppArmor detection #2852

merged 1 commit into from
Mar 21, 2021

Conversation

thaJeztah
Copy link
Member

I recalled I added a similar change in containerd, but didn't upstream it here. Also removing bytes.HasPrefix() in favor of just checking the first character

AkihiroSuda
AkihiroSuda previously approved these changes Mar 15, 2021
View reviewed changes
kolyshkin
kolyshkin reviewed Mar 15, 2021
View reviewed changes
libcontainer/apparmor/apparmor_linux.go Outdated

"github.com/opencontainers/runc/libcontainer/utils"
)

var (
appArmorSupported bool
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: s/Supported/Enabled/

Copy link
Member Author

Choose a reason for hiding this comment

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

Dang! I looked at it and wanted to update, but forgot: done 👍

@kolyshkin
Copy link
Contributor

A nit, LGTM otherwise

@kolyshkin
Copy link
Contributor

CI failure is a flake (#2760 (comment)), CI restarted.

kolyshkin
kolyshkin approved these changes Mar 16, 2021
View reviewed changes
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@kolyshkin
Copy link
Contributor

CI failure

not ok 26 global --debug to --log
# (in test file tests/integration/debug.bats, line 40)
#   `[[ "${output}" == *"child process in init()"* ]]' failed

is a known flake (#2756, should be fixed by #2835).

Restarted CI.

@kolyshkin
Copy link
Contributor

This PR appears to be a champion in the amount of unrelated CI failures.

#2861

CI restarted

@thaJeztah
Copy link
Member Author

This PR appears to be a champion in the amount of unrelated CI failures.

#2861

CI restarted

I opened this PR to reveal flaky tests 🤣😂

@AkihiroSuda AkihiroSuda merged commit e112c95 into opencontainers:master Mar 21, 2021
@thaJeztah thaJeztah deleted the apparmor_once branch March 21, 2021 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

Assignees
No one assigned
Labels
area/apparmor easy-to-review kind/refactor refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @kolyshkin @AkihiroSuda