From 18d19d9ed4ddf3fb514aa91a96fb8744101ce952 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Fri, 22 Nov 2019 00:09:29 -0800
Subject: [PATCH] containerd: update to 1.2.10 (#5341)

Lot's of bugs and security fixes:
https://github.com/containerd/containerd/releases/tag/v1.2.10
CVE-2019-16884 / CVE-2019-16276
https://github.com/containerd/containerd/releases/tag/v1.2.9
CVE-2019-9512 / CVE-2019-9514 / CVE-2019-9515
https://github.com/containerd/containerd/releases/tag/v1.2.8
CVE-2019-9512 / CVE-2019-9514
https://github.com/containerd/containerd/releases/tag/v1.2.7

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
 roles/container-engine/containerd/defaults/main.yml     | 2 +-
 roles/container-engine/containerd/vars/debian.yml       | 5 +++--
 roles/container-engine/containerd/vars/redhat.yml       | 5 +++--
 roles/container-engine/containerd/vars/ubuntu-amd64.yml | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index d3f8e986b..949652515 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -9,7 +9,7 @@ containerd_config:
     "docker.io": "https://registry-1.docker.io"
   max_container_log_line_size: -1
 
-containerd_version: '1.2.6'
+containerd_version: '1.2.10'
 containerd_package: 'containerd.io'
 
 containerd_cfg_dir: /etc/containerd
diff --git a/roles/container-engine/containerd/vars/debian.yml b/roles/container-engine/containerd/vars/debian.yml
index 558517d20..6ad455c57 100644
--- a/roles/container-engine/containerd/vars/debian.yml
+++ b/roles/container-engine/containerd/vars/debian.yml
@@ -5,8 +5,9 @@ containerd_versioned_pkg:
   '1.2.4': "{{ containerd_package }}=1.2.4-1"
   '1.2.5': "{{ containerd_package }}=1.2.5-1"
   '1.2.6': "{{ containerd_package }}=1.2.6-3"
-  'stable': "{{ containerd_package }}=1.2.4-1"
-  'edge': "{{ containerd_package }}=1.2.4-1"
+  '1.2.10': "{{ containerd_package }}=1.2.10-3"
+  'stable': "{{ containerd_package }}=1.2.10-3"
+  'edge': "{{ containerd_package }}=1.2.10-3"
 
 containerd_package_info:
   pkg_mgr: apt
diff --git a/roles/container-engine/containerd/vars/redhat.yml b/roles/container-engine/containerd/vars/redhat.yml
index 199dc35ec..ae6ab87d9 100644
--- a/roles/container-engine/containerd/vars/redhat.yml
+++ b/roles/container-engine/containerd/vars/redhat.yml
@@ -5,8 +5,9 @@ containerd_versioned_pkg:
   '1.2.4': "{{ containerd_package }}-1.2.4-3.1.el7"
   '1.2.5': "{{ containerd_package }}-1.2.5-3.1.el7"
   '1.2.6': "{{ containerd_package }}-1.2.6-3.3.el7"
-  'stable': "{{ containerd_package }}-1.2.6-3.3.el7"
-  'edge': "{{ containerd_package }}-1.2.6-3.3.el7"
+  '1.2.10': "{{ containerd_package }}-1.2.10-3.2.el7"
+  'stable': "{{ containerd_package }}-1.2.10-3.2.el7"
+  'edge': "{{ containerd_package }}-1.2.10-3.2.el7"
 
 containerd_package_info:
   pkg_mgr: yum
diff --git a/roles/container-engine/containerd/vars/ubuntu-amd64.yml b/roles/container-engine/containerd/vars/ubuntu-amd64.yml
index 695e20b6a..6dce99cd9 100644
--- a/roles/container-engine/containerd/vars/ubuntu-amd64.yml
+++ b/roles/container-engine/containerd/vars/ubuntu-amd64.yml
@@ -5,8 +5,9 @@ containerd_versioned_pkg:
   '1.2.4': "{{ containerd_package }}=1.2.4-1"
   '1.2.5': "{{ containerd_package }}=1.2.5-1"
   '1.2.6': "{{ containerd_package }}=1.2.6-3"
-  'stable': "{{ containerd_package }}=1.2.4-1"
-  'edge': "{{ containerd_package }}=1.2.4-1"
+  '1.2.10': "{{ containerd_package }}=1.2.10-3"
+  'stable': "{{ containerd_package }}=1.2.10-3"
+  'edge': "{{ containerd_package }}=1.2.10-3"
 
 containerd_package_info:
   pkg_mgr: apt