From 1429ba9a07a2417013d6e4d57de5b05f5541dafd Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Tue, 14 Jun 2022 11:11:33 +0200
Subject: [PATCH] Update docker version to 20.10.17 (#8965)

---
 roles/container-engine/docker/vars/debian.yml   | 17 +++++++++--------
 roles/container-engine/docker/vars/fedora.yml   | 17 +++++++++--------
 roles/container-engine/docker/vars/redhat-7.yml | 17 +++++++++--------
 roles/container-engine/docker/vars/redhat.yml   | 17 +++++++++--------
 roles/container-engine/docker/vars/ubuntu.yml   | 17 +++++++++--------
 roles/download/defaults/main.yml                |  2 +-
 6 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index a1fbe6b0c..93bd955a6 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/roles/container-engine/docker/vars/debian.yml
@@ -9,25 +9,26 @@ containerd_versioned_pkg:
   '1.4.6': "{{ containerd_package }}=1.4.6-1"
   '1.4.9': "{{ 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"
+  '1.6.4': "{{ containerd_package }}=1.6.4-1"
+  'stable': "{{ containerd_package }}=1.6.4-1"
+  'edge': "{{ containerd_package }}=1.6.4-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.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 }}
+  '20.10': docker-ce=5:20.10.17~3-0~debian-{{ ansible_distribution_release|lower }}
+  'stable': docker-ce=5:20.10.17~3-0~debian-{{ ansible_distribution_release|lower }}
+  'edge': docker-ce=5:20.10.17~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.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 }}
+  '20.10': docker-ce-cli=5:20.10.17~3-0~debian-{{ ansible_distribution_release|lower }}
+  'stable': docker-ce-cli=5:20.10.17~3-0~debian-{{ ansible_distribution_release|lower }}
+  'edge': docker-ce-cli=5:20.10.17~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 9ef21a056..0fcac50fa 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -9,24 +9,25 @@ containerd_versioned_pkg:
   '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 }}"
   '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 }}"
+  '1.6.4': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}"
 
 # https://docs.docker.com/install/linux/docker-ce/fedora/
 # https://download.docker.com/linux/fedora/<fedora-version>/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.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 }}
+  '20.10': docker-ce-20.10.17-3.fc{{ ansible_distribution_major_version }}
+  'stable': docker-ce-20.10.17-3.fc{{ ansible_distribution_major_version }}
+  'edge': docker-ce-20.10.17-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.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 }}
+  '20.10': docker-ce-cli-20.10.17-3.fc{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-20.10.17-3.fc{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-20.10.17-3.fc{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml
index d4569b80d..7fd3d4e44 100644
--- a/roles/container-engine/docker/vars/redhat-7.yml
+++ b/roles/container-engine/docker/vars/redhat-7.yml
@@ -9,8 +9,9 @@ containerd_versioned_pkg:
   '1.4.6': "{{ containerd_package }}-1.4.6-3.1.el7"
   '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el7"
   '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el7"
-  'stable': "{{ containerd_package }}-1.4.12-3.1.el7"
-  'edge': "{{ containerd_package }}-1.4.12-3.1.el7"
+  '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el7"
+  'stable': "{{ containerd_package }}-1.6.4-3.1.el7"
+  'edge': "{{ containerd_package }}-1.6.4-3.1.el7"
 
 # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
 # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/
@@ -19,17 +20,17 @@ docker_versioned_pkg:
   'latest': docker-ce
   '18.09': docker-ce-18.09.9-3.el7
   '19.03': docker-ce-19.03.15-3.el7
-  '20.10': docker-ce-20.10.11-3.el7
-  'stable': docker-ce-20.10.11-3.el7
-  'edge': docker-ce-20.10.11-3.el7
+  '20.10': docker-ce-20.10.17-3.el7
+  'stable': docker-ce-20.10.17-3.el7
+  'edge': docker-ce-20.10.17-3.el7
 
 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.el7
-  '20.10': docker-ce-cli-20.10.11-3.el7
-  'stable': docker-ce-cli-20.10.11-3.el7
-  'edge': docker-ce-cli-20.10.11-3.el7
+  '20.10': docker-ce-cli-20.10.17-3.el7
+  'stable': docker-ce-cli-20.10.17-3.el7
+  'edge': docker-ce-cli-20.10.17-3.el7
 
 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 b14a58509..69fb54ed1 100644
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/roles/container-engine/docker/vars/redhat.yml
@@ -9,8 +9,9 @@ containerd_versioned_pkg:
   '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 }}"
   '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 }}"
+  '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.4-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/<centos_version>>/x86_64/stable/Packages/
@@ -19,17 +20,17 @@ docker_versioned_pkg:
   'latest': docker-ce
   '18.09': docker-ce-3:18.09.9-3.el7
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
-  '20.10': docker-ce-3:20.10.11-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:20.10.11-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:20.10.11-3.el{{ ansible_distribution_major_version }}
+  '20.10': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-1:18.09.9-3.el7
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
-  '20.10': docker-ce-cli-1:20.10.11-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:20.10.11-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:20.10.11-3.el{{ ansible_distribution_major_version }}
+  '20.10': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:20.10.17-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 253dbf17e..ea5cc5e2a 100644
--- a/roles/container-engine/docker/vars/ubuntu.yml
+++ b/roles/container-engine/docker/vars/ubuntu.yml
@@ -9,25 +9,26 @@ containerd_versioned_pkg:
   '1.4.6': "{{ containerd_package }}=1.4.6-1"
   '1.4.9': "{{ 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"
+  '1.6.4': "{{ containerd_package }}=1.6.4-1"
+  'stable': "{{ containerd_package }}=1.6.4-1"
+  'edge': "{{ containerd_package }}=1.6.4-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.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 }}
+  '20.10': docker-ce=5:20.10.17~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+  'stable': docker-ce=5:20.10.17~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+  'edge': docker-ce=5:20.10.17~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.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 }}
+  '20.10': docker-ce-cli=5:20.10.17~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+  'stable': docker-ce-cli=5:20.10.17~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+  'edge': docker-ce-cli=5:20.10.17~3-0~ubuntu-{{ ansible_distribution_release|lower }}
 
 docker_package_info:
   pkgs:
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 40428d3ba..68c71a5cf 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -78,7 +78,7 @@ containerd_version: 1.6.4
 cri_dockerd_version: v0.2.0
 
 # this is relevant when container_manager == 'docker'
-docker_containerd_version: 1.4.12
+docker_containerd_version: 1.6.4
 
 # gcr and kubernetes image repo define
 gcr_image_repo: "gcr.io"