fix(plugins/container): recognize systemd nerdctl cgroups#1378
Open
leogr wants to merge 1 commit into
Open
Conversation
Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: leogr The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Rules files suggestions |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Any specific area of the project related to this PR?
/area plugins
What this PR does / why we need it:
Containers started with nerdctl on systemd-managed containerd run under
/system.slice/nerdctl-<id>.scope. The container plugin discovers them from the containerd runtime event, but syscall events were still attributed tocontainer.id=host, since no matcher recognized that leaf - the 64-hex id is wrapped by thenerdctl-prefix and.scopesuffix, so theruncextractor discards it.This adds a single
{"/nerdctl-", ".scope"}entry toCRI_CGROUP_LAYOUT, mirroring the existingcri-containerd-/docker- systemdscopes, plus anerdctl_systemd_scopeunit test. No new logic, it just reuses the existing 64-hexruncextractor.Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer: