mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-04-11 21:19:28 -02:30
containerd support (#4664)
* Add limited containerd support Containerd support for Ubuntu + Calico * Added CRI-O support for ubuntu * containerd support. * Reset containerd support. * fix lint. * implemented feedback * Change task name cri xx instead of cri-o in reset task and timeout condition. * set crictl to fixed version * Use docker-ce's container.io package for containerd. * Add check containerd is installable or not. * Avoid stop docker when use containerd and optimize retry for reset. * Add config.toml. * Fixed containerd for kubelet.env. * Merge PR #4629 * Remove unused ubuntu variable for containerd * Polish code for containerd and cri-o * Refactoring cri socket configuration. * Configurable conmon. * Remove unused crictl/runc download * Now crictl and runc is downloaded by common crictl.yml. * fixed yamllint error * Fixed brokenfiles by conflict. * Remove commented line in config.toml * Remove readded v1.12.x version * Fixed broken set_docker_image_facts * Fix yamllint errors. * Remove unused apt source * Fix crictl could not be installed * Add containerd config from skolekonov's PR #4601
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
216631bf02
commit
4c8b93e5b9
@@ -24,6 +24,12 @@
|
||||
gpgcheck: no
|
||||
when: ansible_distribution in ["CentOS","RedHat"] and not is_atomic
|
||||
|
||||
- name: Add CRI-O PPA
|
||||
apt_repository:
|
||||
repo: ppa:projectatomic/ppa
|
||||
state: present
|
||||
when: ansible_distribution in ["Ubuntu"]
|
||||
|
||||
- name: Make sure needed folders exist in the system
|
||||
with_items:
|
||||
- /etc/crio
|
||||
|
||||
@@ -64,7 +64,7 @@ file_locking = true
|
||||
# This is a mandatory setting as this runtime will be the default one
|
||||
# and will also be used for untrusted container workloads if
|
||||
# runtime_untrusted_workload is not set.
|
||||
{% if ansible_os_family == "ClearLinux" or ansible_os_family == "RedHat" %}
|
||||
{% if ansible_os_family == "ClearLinux" or ansible_os_family == "RedHat" or ansible_distribution == "Ubuntu" %}
|
||||
runtime = "/usr/bin/runc"
|
||||
{% else %}
|
||||
runtime = "/usr/sbin/runc"
|
||||
@@ -96,7 +96,7 @@ default_workload_trust = "trusted"
|
||||
no_pivot = false
|
||||
|
||||
# conmon is the path to conmon binary, used for managing the runtime.
|
||||
conmon = "/usr/libexec/crio/conmon"
|
||||
conmon = "{{ crio_conmon }}"
|
||||
|
||||
# conmon_env is the environment variable list for conmon process,
|
||||
# used for passing necessary environment variable to conmon or runtime.
|
||||
|
||||
@@ -3,3 +3,4 @@ crio_packages:
|
||||
- containers-basic
|
||||
|
||||
crio_service: crio
|
||||
crio_conmon: /usr/libexec/crio/conmon
|
||||
|
||||
@@ -4,3 +4,4 @@ crio_packages:
|
||||
- cri-tools
|
||||
|
||||
crio_service: cri-o
|
||||
crio_conmon: /usr/libexec/crio/conmon
|
||||
|
||||
@@ -4,4 +4,5 @@ crio_packages:
|
||||
- cri-tools
|
||||
- oci-systemd-hook
|
||||
|
||||
crio_service: crio
|
||||
crio_service: crio
|
||||
crio_conmon: /usr/libexec/crio/conmon
|
||||
|
||||
6
roles/container-engine/cri-o/vars/ubuntu.yml
Normal file
6
roles/container-engine/cri-o/vars/ubuntu.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
crio_packages:
|
||||
- "cri-o-{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)$', '\\g<major>.\\g<minor>') }}"
|
||||
|
||||
crio_service: crio
|
||||
crio_conmon: /usr/lib/crio/bin/conmon
|
||||
Reference in New Issue
Block a user