epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 11:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Spicify the runc path when we use the containerd container engine and change the bin_dir path. (#10154)

Browse Source 
* Specify the runc path when we use the containerd container engine
and change the bin_dir path.

Signed-off-by: Jin Li <qlijin@gmail.com>

* Update roles/container-engine/containerd/templates/config.toml.j2

Co-authored-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

---------

Signed-off-by: Jin Li <qlijin@gmail.com>
Co-authored-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
This commit is contained in:
qlijin
2023-10-31 00:54:31 +08:00
committed by GitHub
parent e2b62ba154
commit af7bc17c9a
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/container-engine/containerd/defaults/main.yml
View File

@@ -18,6 +18,7 @@ containerd_runc_runtime:
base_runtime_spec: cri-base.json base_runtime_spec: cri-base.json
options: options:
systemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}" systemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}"
binaryName: "{{ bin_dir }}/runc"
containerd_additional_runtimes: [] containerd_additional_runtimes: []
# Example for Kata Containers as additional runtime: # Example for Kata Containers as additional runtime:

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

@@ -35,7 +35,11 @@ oom_score = {{ containerd_oom_score }}
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}.options] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}.options]
{% for key, value in runtime.options.items() %} {% for key, value in runtime.options.items() %}
{% if value | string != "true" and value | string != "false" %}
{{ key }} = "{{ value }}"
{% else %}
{{ key }} = {{ value }} {{ key }} = {{ value }}
{% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% if kata_containers_enabled %} {% if kata_containers_enabled %}