diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index 05cfd95c1..9359e1aeb 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -64,6 +64,9 @@ 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 diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2 index a04ec485e..ba107ee8b 100644 --- a/roles/container-engine/containerd/templates/config.toml.j2 +++ b/roles/container-engine/containerd/templates/config.toml.j2 @@ -78,6 +78,9 @@ oom_score = {{ containerd_oom_score }} {% endif %} {% endfor %} + [plugins."io.containerd.nri.v1.nri"] + disable = {{ containerd_nri_disable | default(true) | lower }} + {% if containerd_extra_args is defined %} {{ containerd_extra_args }} {% endif %} diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml index 949ed69ed..053af20e6 100644 --- a/roles/container-engine/cri-o/defaults/main.yml +++ b/roles/container-engine/cri-o/defaults/main.yml @@ -97,3 +97,6 @@ crio_man_files: 8: - crio - crio-status + +# If set to true, it will enable the NRI support in cri-o +crio_enable_nri: false diff --git a/roles/container-engine/cri-o/templates/crio.conf.j2 b/roles/container-engine/cri-o/templates/crio.conf.j2 index 80dc80d05..f92206e32 100644 --- a/roles/container-engine/cri-o/templates/crio.conf.j2 +++ b/roles/container-engine/cri-o/templates/crio.conf.j2 @@ -376,3 +376,8 @@ enable_metrics = {{ crio_enable_metrics | bool | lower }} # The port on which the metrics server will listen. metrics_port = {{ crio_metrics_port }} + +[crio.nri] + +# Enable or disable NRI (Node Resource Interface) support in CRI-O. +enable_nri={{ crio_enable_nri | default(false) | lower }}