Spicify the runc path when we use the containerd container engine and…

… change the bin_dir path. (kubernetes-sigs#10154) * 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>
guytet · Oct 30, 2023 · 2fb439a · 2fb439a
1 parent 2772119
commit 2fb439a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
@@ -18,6 +18,7 @@ containerd_runc_runtime:
   base_runtime_spec: cri-base.json
   options:
     systemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}"
+    binaryName: "{{ bin_dir }}/runc"
 
 containerd_additional_runtimes: []
 # Example for Kata Containers as additional runtime:

diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2
@@ -35,7 +35,11 @@ oom_score = {{ containerd_oom_score }}
 
           [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}.options]
 {% for key, value in runtime.options.items() %}
+{% if value | string != "true" and value | string != "false" %}
+            {{ key }} = "{{ value }}"
+{% else %}
             {{ key }} = {{ value }}
+{% endif %}
 {% endfor %}
 {% endfor %}
 {% if kata_containers_enabled %}