Skip to content

Restore default SELinux security contexts for containerd binaries#17633

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
hakman:selinux
Oct 1, 2025
Merged

Restore default SELinux security contexts for containerd binaries#17633
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
hakman:selinux

Conversation

@hakman
Copy link
Copy Markdown
Member

@hakman hakman commented Sep 29, 2025 •
edited
Loading

Based on #9584 which was removed together with Docker support.
Alternative to #17579.
Fixes kubernetes/kubernetes#133484.

/cc @jsafrane @ameukam

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/nodeup labels Sep 29, 2025
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 29, 2025

/hold for comments

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 29, 2025
@hakman hakman mentioned this pull request Sep 29, 2025
Closed
jsafrane
jsafrane reviewed Oct 1, 2025
View reviewed changes
Comment thread nodeup/pkg/model/containerd.go Outdated

// Restore the default SELinux security contexts for the containerd and runc binaries
if b.Distribution.IsRHELFamily() && b.NodeupConfig.ContainerdConfig != nil && b.NodeupConfig.ContainerdConfig.SeLinuxEnabled {
manifest.Set("Service", "ExecStartPre", "/bin/sh -c 'restorecon -v /usr/bin/runc'")
Copy link
Copy Markdown
Member

@jsafrane jsafrane Oct 1, 2025

Choose a reason for hiding this comment

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

At least on RHEL 9 with runc downloaded by kops:

Suggested change
manifest.Set("Service", "ExecStartPre", "/bin/sh -c 'restorecon -v /usr/bin/runc'")
manifest.Set("Service", "ExecStartPre", "/bin/sh -c 'restorecon -v /usr/sbin/runc'")

Copy link
Copy Markdown
Member Author

@hakman hakman Oct 1, 2025

Choose a reason for hiding this comment

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

Good catch, updated.

@hakman
Restore default SELinux security contexts for containerd binaries
47f8a1a 
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
@jsafrane
Copy link
Copy Markdown
Member

jsafrane commented Oct 1, 2025

/lgtm
works for me with:

kops create cluster --name=${BASE_DOMAIN} --cloud=aws --discovery-store=s3://jsafrane-kops-oidc-store/${BASE_DOMAIN}/discovery --image='309956199498/RHEL-9.6.0_HVM-20250618-x86_64-0-Hourly2-GP3' --zones=us-east-1a --ssh-public-key=/home/jsafrane/.ssh/id_rsa.pub --channel=alpha --kubernetes-feature-gates=SELinuxMount,SELinuxChangePolicy --kubernetes-version=$KUBEVERSION --set=cluster.spec.containerd.selinuxEnabled=true --set=cluster.spec.kubeControllerManager.controllers="*" --set=cluster.spec.kubeControllerManager.controllers="selinux-warning-controller" --set=cluster.spec.kubeControllerManager.logLevel=5

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 1, 2025
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 1, 2025

Thanks for checking @jsafrane! 🙂
/approve
/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2025
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Oct 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 1, 2025
@k8s-ci-robot k8s-ci-robot merged commit 5b05732 into kubernetes:master Oct 1, 2025
26 checks passed
@hakman hakman mentioned this pull request Oct 1, 2025
Closed
@jsafrane jsafrane mentioned this pull request Oct 1, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ameukam ameukam Awaiting requested review from ameukam

1 more reviewer

@jsafrane jsafrane jsafrane left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jsafrane jsafrane

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Move SELinux CI jobs to RHEL9

3 participants

@hakman @jsafrane @k8s-ci-robot