From 801268d5c1d515012b7ea981640a471b80a29af8 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:59:47 +0200
Subject: [PATCH] containerd: upgrade versions 1.4.11 and 1.5.7 and make 1.4.11
 the default (#8129)

---
 roles/download/defaults/main.yml            | 6 ++++++
 roles/kubespray-defaults/defaults/main.yaml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index b1f6cfaf6..8e858bb3a 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -500,13 +500,19 @@ nerdctl_archive_checksums:
 containerd_archive_checksums:
   arm:
     1.4.9: 0
+    1.4.11: 0
     1.5.5: 0
+    1.5.7: 0
   arm64:
     1.4.9: 0
+    1.4.11: 0
     1.5.5: 0
+    1.5.7: 0
   amd64:
     1.4.9: 346f88ad5b973960ff81b5539d4177af5941ec2e4703b479ca9a6081ff1d023b
+    1.4.11: 80c47ec5ce2cd91a15204b5f5b534892ca653e75f3fba0c451ca326bca45fb00
     1.5.5: 8efc527ffb772a82021800f0151374a3113ed2439922497ff08f2596a70f10f1
+    1.5.7: 109fc95b86382065ea668005c376360ddcd8c4ec413e7abe220ae9f461e0e173
 
 etcd_binary_checksum: "{{ etcd_binary_checksums[image_arch] }}"
 cni_binary_checksum: "{{ cni_binary_checksums[image_arch] }}"
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 24345b5a2..99aec470e 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -331,7 +331,7 @@ docker_plugins: []
 etcd_kubeadm_enabled: false
 
 # Containerd options - thse are relevant when container_manager == 'containerd'
-containerd_version: 1.4.9
+containerd_version: 1.4.11
 containerd_use_systemd_cgroup: true
 
 # Docker options - this is relevant when container_manager == 'docker'