External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-02 10:08:13 -03:30
Code Issues Packages Projects Releases Wiki Activity

Refactor NRI activation for containerd and CRI-O (#10470)

Browse Source 
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 1fd31ccc28)
This commit is contained in:
Feruzjon Muyassarov
2023-09-26 18:05:25 +03:00
committed by Florian Ruynat
parent 7bd757da5f
commit b9fc4ec43e
7 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/container-engine/containerd/defaults/main.yml
View File

@@ -64,9 +64,6 @@ containerd_enable_unprivileged_ports: false
# If enabled it will allow non root users to use icmp sockets
containerd_enable_unprivileged_icmp: false
# If enabled, it will activate the NRI support in containerd
containerd_nri_disable: true
containerd_cfg_dir: /etc/containerd
# Extra config to be put in {{ containerd_cfg_dir }}/config.toml literally