cherry-pick: Add configuration option for NRI in crio & containerd #10496
Conversation
…s#10454) * [containerd] Add Configuration option for Node Resource Interface Node Resource Interface (NRI) is a common is a common framework for plugging domain or vendor-specific custom logic into container runtime like containerd. With this commit, we introduce the containerd_disable_nri configuration flag, providing cluster administrators the flexibility to opt in or out (defaulted to 'out') of this feature in containerd. In line with containerd's default configuration, NRI is disabled by default in this containerd role defaults. Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com> * [cri-o] Add configuration option for Node Resource Interface Node Resource Interface (NRI) is a common is a common framework for plugging domain or vendor-specific custom logic into container runtimes like containerd/crio. With this commit, we introduce the crio_enable_nri configuration flag, providing cluster administrators the flexibility to opt in or out (defaulted to 'out') of this feature in cri-o runtime. In line with crio's default configuration, NRI is disabled by default in this cri-o role defaults. Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com> --------- Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com> (cherry picked from commit f964b34)
Refactor NRI (Node Resource Interface) activation in CRI-O and containerd. Introduce a shared variable, nri_enabled, to streamline the process. Currently, enabling NRI requires a separate update of defaults for each container runtime independently, without any verification of NRI support for the specific version of containerd or CRI-O in use. With this commit, the previous approach is replaced. Now, a single variable, nri_enabled, handles this functionality. Also, this commit separates the responsibility of verifying NRI supported versions of containerd and CRI-O from cluster administrators, and leaves it to Ansible. Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com> (cherry picked from commit 1fd31cc)
k8s-ci-robot
added
kind/feature
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: fmuyassarov The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
size/M
|
Hi @floryut @yankay. |
|
I'm failing to understand by looking at the pipeline image job run logs what's the cause of the failure. It seems there is not much to grap from there. |
I'll force merge this, older branches could require a lot of commits to have their CI up to date |
|
Thank you @floryut |
Cherry pick of #10454 and #10470
What type of PR is this?
/kind feature
What this PR does / why we need it:
Node Resource Interface (NRI) is a common framework for plugging domain or vendor-specific custom logic into container runtime like containerd/cri-o. Here we are introducing the configuration flags (
nri_enabled) to provide cluster administrators the flexibility to opt in or out (defaulted to disabled in both runtimes in line with their default configurations) of this feature.NRI initial supported version references in runtimes:
Which issue(s) this PR fixes:
Fixes #
Does this PR introduce a user-facing change?: