diff --git a/docs/CRI/containerd.md b/docs/CRI/containerd.md index 50b973a03..f8dd6b24c 100644 --- a/docs/CRI/containerd.md +++ b/docs/CRI/containerd.md @@ -65,9 +65,8 @@ In kubespray, the default runtime name is "runc", and it can be configured with containerd_runc_runtime: name: runc type: "io.containerd.runc.v2" - engine: "" - root: "" options: + Root: "" SystemdCgroup: "false" BinaryName: /usr/local/bin/my-runc base_runtime_spec: cri-base.json diff --git a/inventory/sample/group_vars/all/containerd.yml b/inventory/sample/group_vars/all/containerd.yml index efa1769fc..6aa7da427 100644 --- a/inventory/sample/group_vars/all/containerd.yml +++ b/inventory/sample/group_vars/all/containerd.yml @@ -11,15 +11,15 @@ # containerd_runc_runtime: # name: runc # type: "io.containerd.runc.v2" -# engine: "" -# root: "" +# options: +# Root: "" # containerd_additional_runtimes: # Example for Kata Containers as additional runtime: # - name: kata # type: "io.containerd.kata.v2" -# engine: "" -# root: "" +# options: +# Root: "" # containerd_grpc_max_recv_message_size: 16777216 # containerd_grpc_max_send_message_size: 16777216 diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index dc4e34697..87f629220 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -13,10 +13,9 @@ containerd_snapshotter: "overlayfs" containerd_runc_runtime: name: runc type: "io.containerd.runc.v2" - engine: "" - root: "" base_runtime_spec: cri-base.json options: + Root: "" SystemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}" BinaryName: "{{ bin_dir }}/runc" @@ -24,8 +23,8 @@ containerd_additional_runtimes: [] # Example for Kata Containers as additional runtime: # - name: kata # type: "io.containerd.kata.v2" -# engine: "" -# root: "" +# options: +# Root: "" containerd_base_runtime_spec_rlimit_nofile: 65535 diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2 index 20f60afbd..7c3da7843 100644 --- a/roles/container-engine/containerd/templates/config.toml.j2 +++ b/roles/container-engine/containerd/templates/config.toml.j2 @@ -52,8 +52,6 @@ oom_score = {{ containerd_oom_score }} {% for runtime in [containerd_runc_runtime] + containerd_additional_runtimes %} [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.{{ runtime.name }}] runtime_type = "{{ runtime.type }}" - runtime_engine = "{{ runtime.engine }}" - runtime_root = "{{ runtime.root }}" {% if runtime.base_runtime_spec is defined %} base_runtime_spec = "{{ containerd_cfg_dir }}/{{ runtime.base_runtime_spec }}" {% endif %}