Remove duplication in template (kubernetes-sigs#9301)

by concatenating default and additional runtimes
enneitex · Jan 25, 2023 · 8e2bc45 · 8e2bc45
1 parent f7c7914
commit 8e2bc45
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2
@@ -22,16 +22,7 @@ oom_score = {{ containerd_oom_score }}
       default_runtime_name = "{{ containerd_default_runtime | default('runc') }}"
       snapshotter = "{{ containerd_snapshotter | default('overlayfs') }}"
       [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
-        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ containerd_runc_runtime.name }}]
-          runtime_type = "{{ containerd_runc_runtime.type }}"
-          runtime_engine = "{{ containerd_runc_runtime.engine}}"
-          runtime_root = "{{ containerd_runc_runtime.root }}"
-          privileged_without_host_devices = {{ containerd_runc_runtime.privileged_without_host_devices|default(false)|lower }}
-          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ containerd_runc_runtime.name }}.options]
-{% for key, value in containerd_runc_runtime.options.items() %}
-            {{ key }} = {{ value }}
-{% endfor %}
-{% for runtime in containerd_additional_runtimes %}
+{% for runtime in [containerd_runc_runtime] + containerd_additional_runtimes %}
         [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}]
           runtime_type = "{{ runtime.type }}"
           runtime_engine = "{{ runtime.engine }}"