mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-03 17:51:12 -03:30
Refactor NRI activation for containerd and CRI-O (#10470)
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:
committed by
Florian Ruynat
parent
7bd757da5f
commit
b9fc4ec43e
@@ -97,6 +97,3 @@ crio_man_files:
|
||||
8:
|
||||
- crio
|
||||
- crio-status
|
||||
|
||||
# If set to true, it will enable the NRI support in cri-o
|
||||
crio_enable_nri: false
|
||||
|
||||
@@ -377,7 +377,8 @@ enable_metrics = {{ crio_enable_metrics | bool | lower }}
|
||||
# The port on which the metrics server will listen.
|
||||
metrics_port = {{ crio_metrics_port }}
|
||||
|
||||
{% if nri_enabled and crio_version >= v1.26.0 %}
|
||||
[crio.nri]
|
||||
|
||||
# Enable or disable NRI (Node Resource Interface) support in CRI-O.
|
||||
enable_nri={{ crio_enable_nri | default(false) | lower }}
|
||||
enable_nri=true
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user