mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-15 10:10:03 -03:30
Set containerd version to 1.4.4 (#7398)
* Set containerd version to 1.4.3 * Set containerd version to 1.4.4 Co-authored-by: Barry Melbourne <9964974+bmelbourne@users.noreply.github.com>
This commit is contained in:
@@ -1,27 +1,40 @@
|
||||
---
|
||||
# The root directory for containerd metadata
|
||||
containerd_metadata_root_dir: /var/lib/containerd
|
||||
# The state directory for containerd
|
||||
containerd_state_dir: /run/containerd
|
||||
|
||||
containerd_config:
|
||||
grpc:
|
||||
max_recv_message_size: 16777216
|
||||
max_send_message_size: 16777216
|
||||
debug:
|
||||
level: ""
|
||||
registries:
|
||||
"docker.io": "https://registry-1.docker.io"
|
||||
max_container_log_line_size: -1
|
||||
# containerd:
|
||||
# snapshotter: native
|
||||
containerd_default_runtime: "runc"
|
||||
# containerd_snapshotter: "native"
|
||||
|
||||
containerd_runtimes:
|
||||
- name: runc
|
||||
type: "io.containerd.runc.v2"
|
||||
engine: ""
|
||||
root: ""
|
||||
options:
|
||||
systemdCgroup: "true"
|
||||
# Example for Kata Containers as additional runtime:
|
||||
# - name: kata
|
||||
# type: "io.containerd.kata.v2"
|
||||
# engine: ""
|
||||
# root: ""
|
||||
|
||||
containerd_grpc_max_recv_message_size: 16777216
|
||||
containerd_grpc_max_send_message_size: 16777216
|
||||
|
||||
containerd_debug_level: "info"
|
||||
|
||||
containerd_metrics_address: ""
|
||||
|
||||
containerd_metrics_grpc_histogram: false
|
||||
|
||||
containerd_registries:
|
||||
"docker.io": "https://registry-1.docker.io"
|
||||
|
||||
containerd_max_container_log_line_size: -1
|
||||
|
||||
containerd_cfg_dir: /etc/containerd
|
||||
|
||||
# Path to runc binary
|
||||
runc_binary: /usr/bin/runc
|
||||
|
||||
|
||||
yum_repo_dir: /etc/yum.repos.d
|
||||
|
||||
# Optional values for containerd apt repo
|
||||
@@ -36,38 +49,18 @@ containerd_repo_info:
|
||||
|
||||
# Ubuntu docker-ce repo
|
||||
containerd_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
|
||||
containerd_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
|
||||
containerd_ubuntu_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
|
||||
containerd_ubuntu_repo_component: 'stable'
|
||||
containerd_ubuntu_repo_gpgkey: "https://download.docker.com/linux/ubuntu/gpg"
|
||||
containerd_ubuntu_repo_repokey: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88"
|
||||
containerd_ubuntu_repo_component: "stable"
|
||||
|
||||
# Debian docker-ce repo
|
||||
containerd_debian_repo_base_url: 'https://download.docker.com/linux/debian'
|
||||
containerd_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
|
||||
containerd_debian_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
|
||||
containerd_debian_repo_component: 'stable'
|
||||
containerd_debian_repo_base_url: "https://download.docker.com/linux/debian"
|
||||
containerd_debian_repo_gpgkey: "https://download.docker.com/linux/debian/gpg"
|
||||
containerd_debian_repo_repokey: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88"
|
||||
containerd_debian_repo_component: "stable"
|
||||
|
||||
# Fedora docker-ce repo
|
||||
containerd_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ ansible_distribution_major_version }}/$basearch/stable'
|
||||
containerd_fedora_repo_gpgkey: 'https://download.docker.com/linux/fedora/gpg'
|
||||
containerd_fedora_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
|
||||
containerd_fedora_repo_component: 'stable'
|
||||
|
||||
containerd_default_runtime:
|
||||
type: io.containerd.runtime.v1.linux
|
||||
engine: ''
|
||||
root: ''
|
||||
|
||||
# Additional runtimes for containerd configuration
|
||||
#
|
||||
# Example for Kata Containers:
|
||||
# containerd_runtimes:
|
||||
# - name: kata
|
||||
# type: io.containerd.kata.v2
|
||||
# engine: ""
|
||||
# root: ""
|
||||
# privileged_without_host_devices: true
|
||||
containerd_runtimes: []
|
||||
|
||||
containerd_untrusted_runtime_type: ''
|
||||
containerd_untrusted_runtime_engine: ''
|
||||
containerd_untrusted_runtime_root: ''
|
||||
containerd_fedora_repo_base_url: "https://download.docker.com/linux/fedora/{{ ansible_distribution_major_version }}/$basearch/stable"
|
||||
containerd_fedora_repo_gpgkey: "https://download.docker.com/linux/fedora/gpg"
|
||||
containerd_fedora_repo_repokey: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88"
|
||||
containerd_fedora_repo_component: "stable"
|
||||
|
||||
@@ -1,80 +1,41 @@
|
||||
# persistent data location
|
||||
root = "{{ containerd_metadata_root_dir }}"
|
||||
# runtime state information
|
||||
state = "{{ containerd_state_dir }}"
|
||||
version = 2
|
||||
|
||||
# Kubernetes doesn't use containerd restart manager.
|
||||
disabled_plugins = ["restart"]
|
||||
[grpc]
|
||||
max_recv_message_size = {{ containerd_grpc_max_recv_message_size | default(16777216) }}
|
||||
max_send_message_size = {{ containerd_grpc_max_send_message_size | default(16777216) }}
|
||||
|
||||
[debug]
|
||||
level = "{{ containerd_config.debug.level | default("") }}"
|
||||
level = "{{ containerd_debug_level | default('info') }}"
|
||||
|
||||
{% if 'grpc' in containerd_config %}
|
||||
[grpc]
|
||||
{% for param, value in containerd_config.grpc.items() %}
|
||||
{{ param }} = {{ value }}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
[plugins.linux]
|
||||
shim = "/usr/bin/containerd-shim"
|
||||
runtime = "{{ runc_binary }}"
|
||||
|
||||
[plugins.cri]
|
||||
stream_server_address = "127.0.0.1"
|
||||
max_container_log_line_size = {{ containerd_config.max_container_log_line_size }}
|
||||
sandbox_image = "{{ pod_infra_image_repo }}:{{ pod_infra_image_tag }}"
|
||||
systemd_cgroup = {{ containerd_use_systemd_cgroup|lower }}
|
||||
|
||||
[plugins.cri.cni]
|
||||
bin_dir = "/opt/cni/bin"
|
||||
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.default_runtime]
|
||||
runtime_type = "{{ containerd_default_runtime.type }}"
|
||||
runtime_engine = "{{ containerd_default_runtime.engine }}"
|
||||
runtime_root = "{{ containerd_default_runtime.root }}"
|
||||
privileged_without_host_devices = {{ containerd_default_runtime.privileged_without_host_devices|default(false)|lower }}
|
||||
|
||||
{% if kata_containers_enabled %}
|
||||
[plugins.cri.containerd.runtimes.kata-qemu]
|
||||
runtime_type = "io.containerd.kata-qemu.v2"
|
||||
[plugins.cri.containerd.runtimes.kata-qemu.options]
|
||||
ConfigPath = "/etc/kata-containers/configuration-qemu.toml"
|
||||
{% endif %}
|
||||
|
||||
{% for runtime in containerd_runtimes %}
|
||||
[plugins.cri.containerd.runtimes.{{ runtime.name }}]
|
||||
runtime_type = "{{ runtime.type }}"
|
||||
runtime_engine = "{{ runtime.engine }}"
|
||||
runtime_root = "{{ runtime.root }}"
|
||||
privileged_without_host_devices = {{ runtime.privileged_without_host_devices|default(false)|lower }}
|
||||
{% endfor %}
|
||||
|
||||
[plugins.cri.containerd.untrusted_workload_runtime]
|
||||
runtime_type = "{{ containerd_untrusted_runtime_type }}"
|
||||
runtime_engine = "{{ containerd_untrusted_runtime_engine }}"
|
||||
runtime_root = "{{ containerd_untrusted_runtime_root }}"
|
||||
|
||||
{% if 'registries' in containerd_config %}
|
||||
[plugins.cri.registry]
|
||||
[plugins.cri.registry.mirrors]
|
||||
{% for registry, addr in containerd_config.registries.items() %}
|
||||
[plugins.cri.registry.mirrors."{{ registry }}"]
|
||||
endpoint = ["{{ ([ addr ] | flatten ) | join('","') }}"]
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if 'metrics' in containerd_config %}
|
||||
[metrics]
|
||||
address = "{{ containerd_config.metrics.address | default('') }}"
|
||||
grpc_histogram = {{ containerd_config.metrics.grpc_histogram | default(false) | lower }}
|
||||
address = "{{ containerd_metrics_address | default('') }}"
|
||||
grpc_histogram = {{ containerd_metrics_grpc_histogram | default(false) | lower }}
|
||||
|
||||
[plugins]
|
||||
[plugins."io.containerd.grpc.v1.cri"]
|
||||
sandbox_image = "{{ pod_infra_image_repo }}:{{ pod_infra_image_tag }}"
|
||||
max_container_log_line_size = {{ containerd_max_container_log_line_size }}
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd]
|
||||
default_runtime_name = "{{ containerd_default_runtime | default('runc') }}"
|
||||
snapshotter = "{{ containerd_snapshotter | default('overlayfs') }}"
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
|
||||
{% for runtime in containerd_runtimes %}
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}]
|
||||
runtime_type = "{{ runtime.type }}"
|
||||
runtime_engine = "{{ runtime.engine }}"
|
||||
runtime_root = "{{ runtime.root }}"
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.{{ runtime.name }}.options]
|
||||
{% for key, value in runtime.options.items() %}
|
||||
{{ key }} = {{ value }}
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
{% if kata_containers_enabled %}
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-qemu]
|
||||
runtime_type = "io.containerd.kata-qemu.v2"
|
||||
{% endif %}
|
||||
[plugins."io.containerd.grpc.v1.cri".registry]
|
||||
[plugins."io.containerd.grpc.v1.cri".registry.mirrors]
|
||||
{% for registry, addr in containerd_registries.items() %}
|
||||
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ registry }}"]
|
||||
endpoint = ["{{ ([ addr ] | flatten ) | join('","') }}"]
|
||||
{% endfor %}
|
||||
|
||||
Reference in New Issue
Block a user