Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configuration option for NRI in crio & containerd #10454

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Add configuration option for NRI in crio & containerd #10454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1b8bce
[containerd] Add Configuration option for Node Resource Interface
fmuyassarov Sep 20, 2023
d6e8f96
[cri-o] Add configuration option for Node Resource Interface
fmuyassarov Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions roles/container-engine/containerd/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

fmuyassarov marked this conversation as resolved.
Show resolved Hide resolved
containerd_cfg_dir: /etc/containerd

# Extra config to be put in {{ containerd_cfg_dir }}/config.toml literally
Expand Down
3 changes: 3 additions & 0 deletions roles/container-engine/containerd/templates/config.toml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
3 changes: 3 additions & 0 deletions roles/container-engine/cri-o/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions roles/container-engine/cri-o/templates/crio.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}