Skip to content

[release/2.1] apparmor: Set abi conditionally#13274

Merged
samuelkarp merged 1 commit into
containerd:release/2.1from
k8s-infra-cherrypick-robot:cherry-pick-13268-to-release/2.1
Apr 23, 2026
Merged

[release/2.1] apparmor: Set abi conditionally#13274
samuelkarp merged 1 commit into
containerd:release/2.1from
k8s-infra-cherrypick-robot:cherry-pick-13268-to-release/2.1

Conversation

@k8s-infra-cherrypick-robot

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Apr 23, 2026

Copy link
Copy Markdown

This is an automated cherry-pick of #13268

/assign cpuguy83

Set AppArmor abi conditionally to support versions < 3.0

The "abi" keyword was added for apparmor 3.0
The original change to add this ended up breaking versions < 3.0.
The abi itself is a macro in /etc/apparmor.d so we can check if the
macro exists to determine if we *can* set an abi in the template.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Apr 23, 2026
@samuelkarp samuelkarp moved this from Review In Progress to Merge on Green in Pull Request Review Apr 23, 2026
@samuelkarp samuelkarp merged commit c7fd1a3 into containerd:release/2.1 Apr 23, 2026
51 checks passed
@github-project-automation github-project-automation Bot moved this from Merge on Green to Done in Pull Request Review Apr 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/runtime Runtime go Pull requests that update Go code impact/changelog size/S

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants