C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update containerd to version 1.4.6 (#7674)

Browse source
This commit is contained in:
Sergey 2021-06-03 20:55:38 +03:00 committed by GitHub
parent 7036b704b3
commit d9d29af87f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -133,7 +133,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.1 - [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.1
- [etcd](https://github.com/coreos/etcd) v3.4.13 - [etcd](https://github.com/coreos/etcd) v3.4.13
- [docker](https://www.docker.com/) v20.10 (see note) - [docker](https://www.docker.com/) v20.10 (see note)
- [containerd](https://containerd.io/) v1.4.4 - [containerd](https://containerd.io/) v1.4.6
- [cri-o](http://cri-o.io/) v1.21 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS) - [cri-o](http://cri-o.io/) v1.21 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
- Network Plugin - Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v0.9.1 - [cni-plugins](https://github.com/containernetworking/plugins) v0.9.1

5
roles/container-engine/containerd-common/vars/amazon.yml
View file

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.2': "{{ containerd_package }}-1.3.2-1.amzn{{ ansible_distribution_major_version }}" '1.3.2': "{{ containerd_package }}-1.3.2-1.amzn{{ ansible_distribution_major_version }}"
'1.4.1': "{{ containerd_package }}-1.4.1-2.amzn{{ ansible_distribution_major_version }}" '1.4.1': "{{ containerd_package }}-1.4.1-2.amzn{{ ansible_distribution_major_version }}"
'1.4.4': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}" '1.4.4': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}" '1.4.6': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}" 'stable': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"

5
roles/container-engine/containerd-common/vars/debian.yml
View file

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}=1.3.9-1" '1.3.9': "{{ containerd_package }}=1.3.9-1"
'1.4.3': "{{ containerd_package }}=1.4.3-2" '1.4.3': "{{ containerd_package }}=1.4.3-2"
'1.4.4': "{{ containerd_package }}=1.4.4-1" '1.4.4': "{{ containerd_package }}=1.4.4-1"
'stable': "{{ containerd_package }}=1.4.4-1" '1.4.6': "{{ containerd_package }}=1.4.6-1"
'edge': "{{ containerd_package }}=1.4.4-1" 'stable': "{{ containerd_package }}=1.4.6-1"
'edge': "{{ containerd_package }}=1.4.6-1"

5
roles/container-engine/containerd-common/vars/fedora.yml
View file

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}" '1.3.9': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}"
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.fc{{ ansible_distribution_major_version }}" '1.4.3': "{{ containerd_package }}-1.4.3-3.2.fc{{ ansible_distribution_major_version }}"
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}" '1.4.4': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}" '1.4.6': "{{ containerd_package }}-1.4.6-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}" 'stable': "{{ containerd_package }}-1.4.6-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.6-3.1.fc{{ ansible_distribution_major_version }}"

5
roles/container-engine/containerd-common/vars/redhat.yml
View file

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}" '1.3.9': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}"
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.el{{ ansible_distribution_major_version }}" '1.4.3': "{{ containerd_package }}-1.4.3-3.2.el{{ ansible_distribution_major_version }}"
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}" '1.4.4': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}" '1.4.6': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}" 'stable': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"

5
roles/container-engine/containerd-common/vars/ubuntu.yml
View file

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}=1.3.9-1" '1.3.9': "{{ containerd_package }}=1.3.9-1"
'1.4.3': "{{ containerd_package }}=1.4.3-2" '1.4.3': "{{ containerd_package }}=1.4.3-2"
'1.4.4': "{{ containerd_package }}=1.4.4-1" '1.4.4': "{{ containerd_package }}=1.4.4-1"
'stable': "{{ containerd_package }}=1.4.4-1" '1.4.6': "{{ containerd_package }}=1.4.6-1"
'edge': "{{ containerd_package }}=1.4.4-1" 'stable': "{{ containerd_package }}=1.4.6-1"
'edge': "{{ containerd_package }}=1.4.6-1"

2
roles/kubespray-defaults/defaults/main.yaml
View file

@ -310,7 +310,7 @@ docker_plugins: []
etcd_kubeadm_enabled: false etcd_kubeadm_enabled: false
# Containerd options # Containerd options
containerd_version: 1.4.4 containerd_version: 1.4.6
containerd_use_systemd_cgroup: true containerd_use_systemd_cgroup: true
# Settings for containerized control plane (etcd/kubelet/secrets) # Settings for containerized control plane (etcd/kubelet/secrets)