From f4a69d2827ff5fe9f3f77ac2523aa593c0baaa20 Mon Sep 17 00:00:00 2001 From: Florian Ruynat <16313165+floryut@users.noreply.github.com> Date: Fri, 4 Dec 2020 01:33:25 +0100 Subject: [PATCH] Update docker to 19.03.14 and containerd to 1.3.9 (#6980) --- README.md | 2 +- .../containerd-common/defaults/main.yml | 2 +- .../container-engine/containerd-common/vars/debian.yml | 5 +++-- .../container-engine/containerd-common/vars/fedora.yml | 5 +++-- .../container-engine/containerd-common/vars/redhat.yml | 5 +++-- .../containerd-common/vars/ubuntu-amd64.yml | 5 +++-- .../containerd-common/vars/ubuntu-arm64.yml | 5 +++-- roles/container-engine/docker/vars/amazon.yml | 2 ++ roles/container-engine/docker/vars/debian.yml | 8 ++++---- roles/container-engine/docker/vars/fedora.yml | 10 +++++----- roles/container-engine/docker/vars/redhat.yml | 8 ++++---- roles/container-engine/docker/vars/ubuntu-amd64.yml | 8 ++++---- roles/container-engine/docker/vars/ubuntu-arm64.yml | 8 ++++---- 13 files changed, 40 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index fe744e0fb..1ba5fa886 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/roles/container-engine/containerd-common/defaults/main.yml b/roles/container-engine/containerd-common/defaults/main.yml index 6a40efc29..16d1857fb 100644 --- a/roles/container-engine/containerd-common/defaults/main.yml +++ b/roles/container-engine/containerd-common/defaults/main.yml @@ -1,3 +1,3 @@ --- -containerd_version: '1.3.7' +containerd_version: '1.3.9' containerd_package: 'containerd.io' diff --git a/roles/container-engine/containerd-common/vars/debian.yml b/roles/container-engine/containerd-common/vars/debian.yml index c58e8184b..9b98dce96 100644 --- a/roles/container-engine/containerd-common/vars/debian.yml +++ b/roles/container-engine/containerd-common/vars/debian.yml @@ -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" diff --git a/roles/container-engine/containerd-common/vars/fedora.yml b/roles/container-engine/containerd-common/vars/fedora.yml index 64e8cd990..bb2a316dd 100644 --- a/roles/container-engine/containerd-common/vars/fedora.yml +++ b/roles/container-engine/containerd-common/vars/fedora.yml @@ -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 }}" diff --git a/roles/container-engine/containerd-common/vars/redhat.yml b/roles/container-engine/containerd-common/vars/redhat.yml index 7eb5b547b..9c666cbd9 100644 --- a/roles/container-engine/containerd-common/vars/redhat.yml +++ b/roles/container-engine/containerd-common/vars/redhat.yml @@ -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 }}" diff --git a/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml b/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml index c58e8184b..9b98dce96 100644 --- a/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml +++ b/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml @@ -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" diff --git a/roles/container-engine/containerd-common/vars/ubuntu-arm64.yml b/roles/container-engine/containerd-common/vars/ubuntu-arm64.yml index f647f0628..a996865ca 100644 --- a/roles/container-engine/containerd-common/vars/ubuntu-arm64.yml +++ b/roles/container-engine/containerd-common/vars/ubuntu-arm64.yml @@ -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" diff --git a/roles/container-engine/docker/vars/amazon.yml b/roles/container-engine/docker/vars/amazon.yml index 089e44104..7de729ac8 100644 --- a/roles/container-engine/docker/vars/amazon.yml +++ b/roles/container-engine/docker/vars/amazon.yml @@ -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" diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index e1221f3a7..601c71af4 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -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 diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml index 9050b5817..89f3af0c2 100644 --- a/roles/container-engine/docker/vars/fedora.yml +++ b/roles/container-engine/docker/vars/fedora.yml @@ -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 diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml index 960cf49dd..fb12b67ac 100644 --- a/roles/container-engine/docker/vars/redhat.yml +++ b/roles/container-engine/docker/vars/redhat.yml @@ -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 diff --git a/roles/container-engine/docker/vars/ubuntu-amd64.yml b/roles/container-engine/docker/vars/ubuntu-amd64.yml index f1f76df78..ba275f057 100644 --- a/roles/container-engine/docker/vars/ubuntu-amd64.yml +++ b/roles/container-engine/docker/vars/ubuntu-amd64.yml @@ -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 diff --git a/roles/container-engine/docker/vars/ubuntu-arm64.yml b/roles/container-engine/docker/vars/ubuntu-arm64.yml index 60b7f8c1f..6afaba1b3 100644 --- a/roles/container-engine/docker/vars/ubuntu-arm64.yml +++ b/roles/container-engine/docker/vars/ubuntu-arm64.yml @@ -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