From 673facbd3a5fdcac334cb372420590a2bd1f1186 Mon Sep 17 00:00:00 2001 From: Florian Ruynat <16313165+floryut@users.noreply.github.com> Date: Tue, 30 Nov 2021 20:49:01 +0100 Subject: [PATCH] Update docker to 20.10.11 with containerd 1.4.12 (#8255) --- roles/container-engine/docker/vars/amazon.yml | 3 ++- roles/container-engine/docker/vars/debian.yml | 17 +++++++++-------- roles/container-engine/docker/vars/fedora.yml | 17 +++++++++-------- roles/container-engine/docker/vars/redhat.yml | 17 +++++++++-------- roles/container-engine/docker/vars/ubuntu.yml | 17 +++++++++-------- .../kubespray-defaults/defaults/main/main.yaml | 2 +- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/roles/container-engine/docker/vars/amazon.yml b/roles/container-engine/docker/vars/amazon.yml index b3d965ef42e..47cf0eb9bc3 100644 --- a/roles/container-engine/docker/vars/amazon.yml +++ b/roles/container-engine/docker/vars/amazon.yml @@ -5,10 +5,11 @@ docker_versioned_pkg: 'latest': docker '18.09': docker-18.09.9ce-2.amzn2 '19.03': docker-19.03.6ce-1.amzn2 + '20.10': docker-20.10.7ce-1.amzn2 docker_version: "latest" docker_package_info: pkgs: - "{{ docker_versioned_pkg[docker_version | string] }}" - enablerepo: amzn2extra-docker \ No newline at end of file + enablerepo: amzn2extra-docker diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index 36b22c2d7d0..a1fbe6b0c22 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -8,25 +8,26 @@ containerd_versioned_pkg: '1.4.4': "{{ containerd_package }}=1.4.4-1" '1.4.6': "{{ containerd_package }}=1.4.6-1" '1.4.9': "{{ containerd_package }}=1.4.9-1" - 'stable': "{{ containerd_package }}=1.4.9-1" - 'edge': "{{ containerd_package }}=1.4.9-1" + '1.4.12': "{{ containerd_package }}=1.4.12-1" + 'stable': "{{ containerd_package }}=1.4.12-1" + 'edge': "{{ containerd_package }}=1.4.12-1" # https://download.docker.com/linux/debian/ docker_versioned_pkg: 'latest': docker-ce '18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }} '19.03': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release|lower }} - '20.10': docker-ce=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }} - 'stable': docker-ce=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }} - 'edge': docker-ce=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }} + '20.10': docker-ce=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }} + 'stable': docker-ce=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }} + 'edge': docker-ce=5:20.10.11~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.15~3-0~debian-{{ ansible_distribution_release|lower }} - '20.10': docker-ce-cli=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }} - 'stable': docker-ce-cli=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }} - 'edge': docker-ce-cli=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }} + '20.10': docker-ce-cli=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }} + 'stable': docker-ce-cli=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }} + 'edge': docker-ce-cli=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }} docker_package_info: pkgs: diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml index 278dfe0fe73..9ef21a05636 100644 --- a/roles/container-engine/docker/vars/fedora.yml +++ b/roles/container-engine/docker/vars/fedora.yml @@ -8,24 +8,25 @@ containerd_versioned_pkg: '1.4.4': "{{ 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 }}" '1.4.9': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}" + '1.4.12': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}" # https://docs.docker.com/install/linux/docker-ce/fedora/ # https://download.docker.com/linux/fedora//x86_64/stable/Packages/ docker_versioned_pkg: 'latest': docker-ce '19.03': docker-ce-19.03.15-3.fc{{ ansible_distribution_major_version }} - '20.10': docker-ce-20.10.9-3.fc{{ ansible_distribution_major_version }} - 'stable': docker-ce-20.10.9-3.fc{{ ansible_distribution_major_version }} - 'edge': docker-ce-20.10.9-3.fc{{ ansible_distribution_major_version }} + '20.10': docker-ce-20.10.11-3.fc{{ ansible_distribution_major_version }} + 'stable': docker-ce-20.10.11-3.fc{{ ansible_distribution_major_version }} + 'edge': docker-ce-20.10.11-3.fc{{ ansible_distribution_major_version }} docker_cli_versioned_pkg: 'latest': docker-ce-cli '19.03': docker-ce-cli-19.03.15-3.fc{{ ansible_distribution_major_version }} - '20.10': docker-ce-cli-20.10.9-3.fc{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-20.10.9-3.fc{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-20.10.9-3.fc{{ ansible_distribution_major_version }} + '20.10': docker-ce-cli-20.10.11-3.fc{{ ansible_distribution_major_version }} + 'stable': docker-ce-cli-20.10.11-3.fc{{ ansible_distribution_major_version }} + 'edge': docker-ce-cli-20.10.11-3.fc{{ ansible_distribution_major_version }} docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml index 5cc83529e80..d21babc5120 100644 --- a/roles/container-engine/docker/vars/redhat.yml +++ b/roles/container-engine/docker/vars/redhat.yml @@ -8,8 +8,9 @@ containerd_versioned_pkg: '1.4.4': "{{ 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 }}" '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}" + '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/>/x86_64/stable/Packages/ @@ -18,17 +19,17 @@ docker_versioned_pkg: 'latest': docker-ce '18.09': docker-ce-18.09.9-3.el7 '19.03': docker-ce-19.03.15-3.el{{ ansible_distribution_major_version }} - '20.10': docker-ce-20.10.9-3.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-20.10.9-3.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-20.10.9-3.el{{ ansible_distribution_major_version }} + '20.10': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }} + 'stable': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }} + 'edge': docker-ce-20.10.11-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.15-3.el{{ ansible_distribution_major_version }} - '20.10': docker-ce-cli-20.10.9-3.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-20.10.9-3.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-20.10.9-3.el{{ ansible_distribution_major_version }} + '20.10': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }} + 'stable': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }} + 'edge': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }} docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml index fb85f24066b..253dbf17e83 100644 --- a/roles/container-engine/docker/vars/ubuntu.yml +++ b/roles/container-engine/docker/vars/ubuntu.yml @@ -8,25 +8,26 @@ containerd_versioned_pkg: '1.4.4': "{{ containerd_package }}=1.4.4-1" '1.4.6': "{{ containerd_package }}=1.4.6-1" '1.4.9': "{{ containerd_package }}=1.4.9-1" - 'stable': "{{ containerd_package }}=1.4.9-1" - 'edge': "{{ containerd_package }}=1.4.9-1" + '1.4.12': "{{ containerd_package }}=1.4.12-1" + 'stable': "{{ containerd_package }}=1.4.12-1" + 'edge': "{{ containerd_package }}=1.4.12-1" # https://download.docker.com/linux/ubuntu/ docker_versioned_pkg: 'latest': docker-ce '18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} '19.03': docker-ce=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release|lower }} - '20.10': docker-ce=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} - 'stable': docker-ce=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} - 'edge': docker-ce=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} + '20.10': docker-ce=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }} + 'stable': docker-ce=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }} + 'edge': docker-ce=5:20.10.11~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.15~3-0~ubuntu-{{ ansible_distribution_release|lower }} - '20.10': docker-ce-cli=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} - 'stable': docker-ce-cli=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} - 'edge': docker-ce-cli=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }} + '20.10': docker-ce-cli=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }} + 'stable': docker-ce-cli=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }} + 'edge': docker-ce-cli=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }} docker_package_info: pkgs: diff --git a/roles/kubespray-defaults/defaults/main/main.yaml b/roles/kubespray-defaults/defaults/main/main.yaml index bafc88b2a31..abb01e9fe18 100644 --- a/roles/kubespray-defaults/defaults/main/main.yaml +++ b/roles/kubespray-defaults/defaults/main/main.yaml @@ -334,7 +334,7 @@ containerd_version: 1.4.11 containerd_use_systemd_cgroup: true # Docker options - this is relevant when container_manager == 'docker' -docker_containerd_version: 1.4.9 +docker_containerd_version: 1.4.12 # Settings for containerized control plane (etcd/kubelet/secrets) # deployment type for legacy etcd mode