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

Update containerd to 1.3.7 - add fedora32/centos8 containerd packages (#6749)

Browse source
This commit is contained in:
Florian Ruynat 2020-09-25 17:15:11 +02:00 committed by GitHub
parent 081a9e7bd8
commit c2ac3b51c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -119,7 +119,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.19.2
- [etcd](https://github.com/coreos/etcd) v3.4.3
- [docker](https://www.docker.com/) v19.03 (see note)
- [containerd](https://containerd.io/) v1.2.13
- [containerd](https://containerd.io/) v1.3.7
- [cri-o](http://cri-o.io/) v1.17 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
- Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v0.8.6

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

@ -1,3 +1,3 @@
---
containerd_version: '1.2.13'
containerd_version: '1.3.7'
containerd_package: 'containerd.io'

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

@ -7,5 +7,6 @@ containerd_versioned_pkg:
'1.2.10': "{{ containerd_package }}=1.2.10-3"
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ containerd_package }}=1.2.13-2"
'stable': "{{ containerd_package }}=1.2.13-2"
'edge': "{{ containerd_package }}=1.2.13-2"
'1.3.7': "{{ containerd_package }}=1.3.7-1"
'stable': "{{ containerd_package }}=1.3.7-1"
'edge': "{{ containerd_package }}=1.3.7-1"

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

@ -1,11 +1,9 @@
---
# TODO Remove the line below as soon as containerd rpm are available for f32
fedora_distribution_package: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.2.10': "{{ containerd_package }}-1.2.10-3.2.fc{{ fedora_distribution_package }}"
'1.2.12': "{{ containerd_package }}-1.2.12-3.1.fc{{ fedora_distribution_package }}"
'1.2.13': "{{ containerd_package }}-1.2.13-3.2.fc{{ fedora_distribution_package }}"
'stable': "{{ containerd_package }}-1.2.13-3.2.fc{{ fedora_distribution_package }}"
'edge': "{{ containerd_package }}-1.2.13-3.2.fc{{ fedora_distribution_package }}"
'1.2.10': "{{ containerd_package }}-1.2.10-3.2.fc{{ ansible_distribution_major_version }}"
'1.2.12': "{{ containerd_package }}-1.2.12-3.1.fc{{ ansible_distribution_major_version }}"
'1.2.13': "{{ containerd_package }}-1.2.13-3.2.fc{{ ansible_distribution_major_version }}"
'1.3.7': "{{ containerd_package }}-1.3.7-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.3.7-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.3.7-3.1.fc{{ ansible_distribution_major_version }}"

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

@ -7,5 +7,6 @@ containerd_versioned_pkg:
'1.2.10': "{{ containerd_package }}-1.2.10-3.2.el7"
'1.2.12': "{{ containerd_package }}-1.2.12-3.1.el7"
'1.2.13': "{{ containerd_package }}-1.2.13-3.2.el7"
'stable': "{{ containerd_package }}-1.2.13-3.2.el7"
'edge': "{{ containerd_package }}-1.2.13-3.2.el7"
'1.3.7': "{{ containerd_package }}-1.3.7-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.3.7-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.3.7-3.1.el{{ ansible_distribution_major_version }}"

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

@ -7,5 +7,6 @@ containerd_versioned_pkg:
'1.2.10': "{{ containerd_package }}=1.2.10-3"
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ containerd_package }}=1.2.13-2"
'stable': "{{ containerd_package }}=1.2.13-2"
'edge': "{{ containerd_package }}=1.2.13-2"
'1.3.7': "{{ containerd_package }}=1.3.7-1"
'stable': "{{ containerd_package }}=1.3.7-1"
'edge': "{{ containerd_package }}=1.3.7-1"

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

@ -4,5 +4,6 @@ containerd_versioned_pkg:
'1.2.10': "{{ containerd_package }}=1.2.10-3"
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ containerd_package }}=1.2.13-2"
'stable': "{{ containerd_package }}=1.2.13-2"
'edge': "{{ containerd_package }}=1.2.13-2"
'1.3.7': "{{ containerd_package }}=1.3.7-1"
'stable': "{{ containerd_package }}=1.3.7-1"
'edge': "{{ containerd_package }}=1.3.7-1"

4
roles/container-engine/containerd/defaults/main.yml
View file

@ -47,9 +47,7 @@ containerd_debian_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
containerd_debian_repo_component: 'stable'
# Fedora docker-ce repo
# TODO Remove the line below as soon as containerd rpm are available for f32
containerd_fedora_release: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
containerd_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ containerd_fedora_release }}/$basearch/stable'
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'