kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ability to define plugins.cri.containerd params (#5624) 

* Ability to define plugins.cri.containerd params

* addition of containerd field commented as an example

* documentation of containerd_config
pull/5616/head
Erwan Miran 2020-02-17 11:15:29 +01:00 committed by GitHub
parent 579976260f
commit f7c5f45833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/vars.md
View File

@ -104,6 +104,8 @@ Stack](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/dns-stack.m
* *docker_options* - Commonly used to set * *docker_options* - Commonly used to set
``--insecure-registry=myregistry.mydomain:5000`` ``--insecure-registry=myregistry.mydomain:5000``
* *docker_plugins* - This list can be used to define [Docker plugins](https://docs.docker.com/engine/extend/) to install. * *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 * *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 proxy. Note that no_proxy defaults to all internal cluster IPs and hostnames
that correspond to each node. that correspond to each node.

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

@ -8,6 +8,8 @@ containerd_config:
registries: registries:
"docker.io": "https://registry-1.docker.io" "docker.io": "https://registry-1.docker.io"
max_container_log_line_size: -1 max_container_log_line_size: -1
# containerd:
# snapshotter: native
containerd_version: '1.2.10' containerd_version: '1.2.10'
containerd_package: 'containerd.io' containerd_package: 'containerd.io'

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

@ -25,6 +25,12 @@ disabled_plugins = ["restart"]
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"
conf_template = "" 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] [plugins.cri.containerd.untrusted_workload_runtime]
runtime_type = "" runtime_type = ""
runtime_engine = "" runtime_engine = ""