diff --git a/docs/vars.md b/docs/vars.md index b2a9dc452a09968d82d93f6f042b028dfd72e816..20bf85456249a6dc57c49500c2f870fc0ef81837 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -104,6 +104,8 @@ Stack](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/dns-stack.m * *docker_options* - Commonly used to set ``--insecure-registry=myregistry.mydomain:5000`` * *docker_plugins* - This list can be used to define [Docker plugins](https://docs.docker.com/engine/extend/) to install. +* *containerd_config* - Controls some parameters in containerd configuration file (usually /etc/containerd/config.toml). + [Default config](https://github.com/kubernetes-sigs/kubespray/blob/master/roles/container-engine/containerd/defaults/main.yml) can be overriden in inventory vars. * *http_proxy/https_proxy/no_proxy* - Proxy variables for deploying behind a proxy. Note that no_proxy defaults to all internal cluster IPs and hostnames that correspond to each node. diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index 9496525156077d86a8049c2174f13680b11e0531..5e39ac2588e8d275ba07721f8dfd5eb31b0e5873 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -8,6 +8,8 @@ containerd_config: registries: "docker.io": "https://registry-1.docker.io" max_container_log_line_size: -1 + # containerd: + # snapshotter: native containerd_version: '1.2.10' containerd_package: 'containerd.io' diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2 index 14413462a093cb6d6b5d193d9a7cf02596db16d6..142b21fa5989b9b6aa79b2a730592d97b422649c 100644 --- a/roles/container-engine/containerd/templates/config.toml.j2 +++ b/roles/container-engine/containerd/templates/config.toml.j2 @@ -25,6 +25,12 @@ disabled_plugins = ["restart"] conf_dir = "/etc/cni/net.d" conf_template = "" +{% if 'containerd' in containerd_config %} +[plugins.cri.containerd] +{% for param, value in containerd_config.containerd.items() %} + {{ param }} = {{ value }} +{% endfor %} +{% endif %} [plugins.cri.containerd.untrusted_workload_runtime] runtime_type = "" runtime_engine = ""