External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-01-08 14:32:09 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removed deprecated keys from containerd config (#12820)

Browse Source 
Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
Ali Afsharzadeh 2026-01-02 12:26:35 +03:30 committed by GitHub
parent 3a3e5d6954
commit a0f00761ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/CRI/containerd.md
View File

@ -65,9 +65,8 @@ In kubespray, the default runtime name is "runc", and it can be configured with
containerd_runc_runtime: containerd_runc_runtime:
name: runc name: runc
type: "io.containerd.runc.v2" type: "io.containerd.runc.v2"
engine: ""
root: ""
options: options:
Root: ""
SystemdCgroup: "false" SystemdCgroup: "false"
BinaryName: /usr/local/bin/my-runc BinaryName: /usr/local/bin/my-runc
base_runtime_spec: cri-base.json base_runtime_spec: cri-base.json

8
inventory/sample/group_vars/all/containerd.yml
View File

@ -11,15 +11,15 @@
# containerd_runc_runtime: # containerd_runc_runtime:
# name: runc # name: runc
# type: "io.containerd.runc.v2" # type: "io.containerd.runc.v2"
# engine: "" # options:
# root: "" # Root: ""
# containerd_additional_runtimes: # containerd_additional_runtimes:
# Example for Kata Containers as additional runtime: # Example for Kata Containers as additional runtime:
# - name: kata # - name: kata
# type: "io.containerd.kata.v2" # type: "io.containerd.kata.v2"
# engine: "" # options:
# root: "" # Root: ""
# containerd_grpc_max_recv_message_size: 16777216 # containerd_grpc_max_recv_message_size: 16777216
# containerd_grpc_max_send_message_size: 16777216 # containerd_grpc_max_send_message_size: 16777216

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

@ -13,10 +13,9 @@ containerd_snapshotter: "overlayfs"
containerd_runc_runtime: containerd_runc_runtime:
name: runc name: runc
type: "io.containerd.runc.v2" type: "io.containerd.runc.v2"
engine: ""
root: ""
base_runtime_spec: cri-base.json base_runtime_spec: cri-base.json
options: options:
Root: ""
SystemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}" SystemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}"
BinaryName: "{{ bin_dir }}/runc" BinaryName: "{{ bin_dir }}/runc"
@ -24,8 +23,8 @@ containerd_additional_runtimes: []
# Example for Kata Containers as additional runtime: # Example for Kata Containers as additional runtime:
# - name: kata # - name: kata
# type: "io.containerd.kata.v2" # type: "io.containerd.kata.v2"
# engine: "" # options:
# root: "" # Root: ""
containerd_base_runtime_spec_rlimit_nofile: 65535 containerd_base_runtime_spec_rlimit_nofile: 65535

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

@ -52,8 +52,6 @@ oom_score = {{ containerd_oom_score }}
{% for runtime in [containerd_runc_runtime] + containerd_additional_runtimes %} {% for runtime in [containerd_runc_runtime] + containerd_additional_runtimes %}
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.{{ runtime.name }}] [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.{{ runtime.name }}]
runtime_type = "{{ runtime.type }}" runtime_type = "{{ runtime.type }}"
runtime_engine = "{{ runtime.engine }}"
runtime_root = "{{ runtime.root }}"
{% if runtime.base_runtime_spec is defined %} {% if runtime.base_runtime_spec is defined %}
base_runtime_spec = "{{ containerd_cfg_dir }}/{{ runtime.base_runtime_spec }}" base_runtime_spec = "{{ containerd_cfg_dir }}/{{ runtime.base_runtime_spec }}"
{% endif %} {% endif %}