External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-21 05:00: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

4
roles/container-engine/containerd/templates/config.toml.j2
View File

@@ -78,8 +78,10 @@ oom_score = {{ containerd_oom_score }}
{% endif %}
{% endfor %}
{% if nri_enabled and containerd_version >= 1.7.0 %}
[plugins."io.containerd.nri.v1.nri"]
disable = {{ containerd_nri_disable | default(true) | lower }}
disable = false
{% endif %}
{% if containerd_extra_args is defined %}
{{ containerd_extra_args }}