mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2025-12-14 13:54:37 +03:00
fix: Enable NRI for containerd and disable plugin when nri_enabled is false (#12152)
* fix(containerd): always render NRI plugin block with conditional disable flag * feat: enable Node Resource Interface plugin when using containerd * fix: remove the * fix: fix for linter
This commit is contained in:
@@ -76,10 +76,8 @@ oom_score = {{ containerd_oom_score }}
|
||||
[plugins."io.containerd.cri.v1.images".registry]
|
||||
config_path = "{{ containerd_cfg_dir }}/certs.d"
|
||||
|
||||
{% if nri_enabled %}
|
||||
[plugins."io.containerd.nri.v1.nri"]
|
||||
disable = false
|
||||
{% endif %}
|
||||
disable = {{ 'false' if nri_enabled else 'true' }}
|
||||
|
||||
{% if containerd_tracing_enabled %}
|
||||
[plugins."io.containerd.tracing.processor.v1.otlp"]
|
||||
|
||||
@@ -306,9 +306,8 @@ deploy_container_engine: "{{ 'k8s_cluster' in group_names or etcd_deployment_typ
|
||||
# Container for runtime
|
||||
container_manager: containerd
|
||||
|
||||
# Enable Node Resource Interface in containerd or CRI-O. Requires crio_version >= v1.26.0
|
||||
# or containerd_version >= 1.7.0.
|
||||
nri_enabled: false
|
||||
# Enable Node Resource Interface plugin for containerd
|
||||
nri_enabled: "{{ container_manager == 'containerd' }}"
|
||||
|
||||
# Enable Kata Containers as additional container runtime
|
||||
# When enabled, it requires `container_manager` different than Docker
|
||||
|
||||
Reference in New Issue
Block a user