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

Update docker to 19.03.14 and containerd to 1.3.9 (#6980)

Browse source
This commit is contained in:
Florian Ruynat 2020-12-04 01:33:25 +01:00 committed by GitHub
parent ed6cef85d8
commit f4a69d2827
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 40 additions and 33 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.4
- [etcd](https://github.com/coreos/etcd) v3.4.3
- [docker](https://www.docker.com/) v19.03 (see note)
- [containerd](https://containerd.io/) v1.3.7
- [containerd](https://containerd.io/) v1.3.9
- [cri-o](http://cri-o.io/) v1.19 (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.7

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

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

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

@ -8,5 +8,6 @@ containerd_versioned_pkg:
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ 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"
'1.3.9': "{{ containerd_package }}=1.3.9-1"
'stable': "{{ containerd_package }}=1.3.9-1"
'edge': "{{ containerd_package }}=1.3.9-1"

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

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'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 }}"
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}"

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

@ -8,5 +8,6 @@ containerd_versioned_pkg:
'1.2.12': "{{ containerd_package }}-1.2.12-3.1.el7"
'1.2.13': "{{ 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 }}"
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}"

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

@ -8,5 +8,6 @@ containerd_versioned_pkg:
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ 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"
'1.3.9': "{{ containerd_package }}=1.3.9-1"
'stable': "{{ containerd_package }}=1.3.9-1"
'edge': "{{ containerd_package }}=1.3.9-1"

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

@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ 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"
'1.3.9': "{{ containerd_package }}=1.3.9-1"
'stable': "{{ containerd_package }}=1.3.9-1"
'edge': "{{ containerd_package }}=1.3.9-1"

2
roles/container-engine/docker/vars/amazon.yml
View file

@ -7,6 +7,8 @@ docker_versioned_pkg:
'latest': docker
'18.03': docker-18.03.1ce-5.amzn2
'18.06': docker-18.06.1ce-10.amzn2
'18.09': docker-18.09.9ce-2.amzn2
'19.03': docker-19.03.6ce-1.amzn2
docker_version: "latest"

8
roles/container-engine/docker/vars/debian.yml
View file

@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce=18.03.1~ce-0~debian
'18.06': docker-ce=18.06.2~ce~3-0~debian
'18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.14~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.14~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.14~3-0~debian-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~debian-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.14~3-0~debian-{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt

10
roles/container-engine/docker/vars/fedora.yml
View file

@ -8,14 +8,14 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-3.fc{{ ansible_distribution_major_version }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-18.09.7-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.13-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.14-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.14-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.14-3.fc{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-19.03.13-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.13-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-cli-19.03.14-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.14-3.fc{{ ansible_distribution_major_version }}
docker_package_info:
pkg_mgr: dnf

8
roles/container-engine/docker/vars/redhat.yml
View file

@ -12,14 +12,14 @@ docker_versioned_pkg:
'18.03': docker-ce-18.03.1.ce-1.el7.centos
'18.06': docker-ce-18.06.3.ce-3.el7
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.13-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.13-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.13-3.el{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.14-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.14-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.14-3.el{{ ansible_distribution_major_version }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-18.09.9-3.el7
'19.03': docker-ce-cli-19.03.13-3.el{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.14-3.el{{ ansible_distribution_major_version }}
docker_selinux_versioned_pkg:
'latest': docker-ce-selinux-17.03.3.ce-1.el7

8
roles/container-engine/docker/vars/ubuntu-amd64.yml
View file

@ -12,14 +12,14 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt

8
roles/container-engine/docker/vars/ubuntu-arm64.yml
View file

@ -8,14 +8,14 @@ docker_versioned_pkg:
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.13~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'19.03': docker-ce-cli=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info:
pkg_mgr: apt