Skip to content

Conversation

ShinyaIshitobi
Copy link
Contributor

@ShinyaIshitobi ShinyaIshitobi commented Apr 23, 2025

What type of PR is this?
/kind bug

What this PR does / why we need it:

This PR updates the nri_enabled configuration in Kubespray to:

  • Automatically enable the Node Resource Interface (NRI) plugin when container_manager == 'containerd'
  • Disable the NRI plugin (and fully deactivate it per Containerd documentation) for all other container runtimes (e.g., CRI-O)

Which issue(s) this PR fixes:

Fixes #12118

Special notes for your reviewer:

This is my first open-source contribution, so there may be areas that need improvement; thank you in advance for your review.

Does this PR introduce a user-facing change?:

Enable NRI by default on containerd (following containerd defaults)

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Apr 23, 2025
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 23, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @ShinyaIshitobi!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 23, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @ShinyaIshitobi. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@tico88612
Copy link
Member

/kind bug
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. kind/bug Categorizes issue or PR as related to a bug. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 23, 2025
Copy link
Member

@tico88612 tico88612 left a comment

Choose a reason for hiding this comment

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

/lgtm

Thank you!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 23, 2025
@ShinyaIshitobi
Copy link
Contributor Author

/assign

@ShinyaIshitobi
Copy link
Contributor Author

/assign VannTen

@yankay
Copy link
Member

yankay commented Apr 24, 2025

Thanks @ShinyaIshitobi
/lgtm

@tico88612
Copy link
Member

/retest-failed

Copy link
Contributor

@VannTen VannTen left a comment

Choose a reason for hiding this comment

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

To check my understanding: this is about following upstream defaults, right ?

NRI is enabled on containerd but not on CRI-O ?

IMO even if it's upstream, it warrants a release.

@tico88612
Copy link
Member

Yes, this is following containerd upstream, and make sure nri_enabled is work.

CRI-O's NRI default is still disabled.

@VannTen
Copy link
Contributor

VannTen commented Apr 24, 2025 via email

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Apr 24, 2025
@k8s-ci-robot k8s-ci-robot removed the release-note-none Denotes a PR that doesn't merit a release note. label Apr 24, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ShinyaIshitobi, tico88612, VannTen

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2025
@k8s-ci-robot k8s-ci-robot merged commit 629a690 into kubernetes-sigs:master Apr 24, 2025
46 checks passed
ErmolenkoMaxim pushed a commit to ErmolenkoMaxim/kubespray that referenced this pull request Apr 24, 2025
… false (kubernetes-sigs#12152)

* fix(containerd): always render NRI plugin block with conditional disable flag

* feat: enable Node Resource Interface plugin when using containerd

* fix: remove the

* fix: fix for linter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[containerd] nri_enabled not working excepted
5 participants