From d9d29af87f724df5e01ffa72464e7fb08fb882cc Mon Sep 17 00:00:00 2001
From: Sergey <s.bondarev@southbridge.ru>
Date: Thu, 3 Jun 2021 20:55:38 +0300
Subject: [PATCH] update containerd to version 1.4.6 (#7674)
---
README.md | 2 +-
roles/container-engine/containerd-common/vars/amazon.yml | 5 +++--
roles/container-engine/containerd-common/vars/debian.yml | 5 +++--
roles/container-engine/containerd-common/vars/fedora.yml | 5 +++--
roles/container-engine/containerd-common/vars/redhat.yml | 5 +++--
roles/container-engine/containerd-common/vars/ubuntu.yml | 5 +++--
roles/kubespray-defaults/defaults/main.yaml | 2 +-
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index c7232cd0b..84ab19600 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.21.1
- [etcd](https://github.com/coreos/etcd) v3.4.13
- [docker](https://www.docker.com/) v20.10 (see note)
- - [containerd](https://containerd.io/) v1.4.4
+ - [containerd](https://containerd.io/) v1.4.6
- [cri-o](http://cri-o.io/) v1.21 (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.9.1
diff --git a/roles/container-engine/containerd-common/vars/amazon.yml b/roles/container-engine/containerd-common/vars/amazon.yml
index d492fc56e..3ad56d4d4 100644
--- a/roles/container-engine/containerd-common/vars/amazon.yml
+++ b/roles/container-engine/containerd-common/vars/amazon.yml
@@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.2': "{{ containerd_package }}-1.3.2-1.amzn{{ ansible_distribution_major_version }}"
'1.4.1': "{{ containerd_package }}-1.4.1-2.amzn{{ ansible_distribution_major_version }}"
'1.4.4': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}"
- 'stable': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}"
- 'edge': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}"
+ '1.4.6': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
+ 'stable': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
+ 'edge': "{{ containerd_package }}-1.4.6-1.amzn{{ ansible_distribution_major_version }}"
diff --git a/roles/container-engine/containerd-common/vars/debian.yml b/roles/container-engine/containerd-common/vars/debian.yml
index 6c0ad9c54..2832884e5 100644
--- a/roles/container-engine/containerd-common/vars/debian.yml
+++ b/roles/container-engine/containerd-common/vars/debian.yml
@@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}=1.3.9-1"
'1.4.3': "{{ containerd_package }}=1.4.3-2"
'1.4.4': "{{ containerd_package }}=1.4.4-1"
- 'stable': "{{ containerd_package }}=1.4.4-1"
- 'edge': "{{ containerd_package }}=1.4.4-1"
+ '1.4.6': "{{ containerd_package }}=1.4.6-1"
+ 'stable': "{{ containerd_package }}=1.4.6-1"
+ 'edge': "{{ containerd_package }}=1.4.6-1"
diff --git a/roles/container-engine/containerd-common/vars/fedora.yml b/roles/container-engine/containerd-common/vars/fedora.yml
index 2ffc0987b..7c712c18e 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.3.9': "{{ containerd_package }}-1.3.9-3.1.fc{{ ansible_distribution_major_version }}"
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.fc{{ ansible_distribution_major_version }}"
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}"
- 'stable': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}"
- 'edge': "{{ 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 }}"
+ 'stable': "{{ containerd_package }}-1.4.6-3.1.fc{{ ansible_distribution_major_version }}"
+ 'edge': "{{ containerd_package }}-1.4.6-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 04e320f15..f8018a184 100644
--- a/roles/container-engine/containerd-common/vars/redhat.yml
+++ b/roles/container-engine/containerd-common/vars/redhat.yml
@@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}-1.3.9-3.1.el{{ ansible_distribution_major_version }}"
'1.4.3': "{{ containerd_package }}-1.4.3-3.2.el{{ ansible_distribution_major_version }}"
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}"
- 'stable': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}"
- 'edge': "{{ 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 }}"
+ 'stable': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"
+ 'edge': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"
diff --git a/roles/container-engine/containerd-common/vars/ubuntu.yml b/roles/container-engine/containerd-common/vars/ubuntu.yml
index 6c0ad9c54..2832884e5 100644
--- a/roles/container-engine/containerd-common/vars/ubuntu.yml
+++ b/roles/container-engine/containerd-common/vars/ubuntu.yml
@@ -5,5 +5,6 @@ containerd_versioned_pkg:
'1.3.9': "{{ containerd_package }}=1.3.9-1"
'1.4.3': "{{ containerd_package }}=1.4.3-2"
'1.4.4': "{{ containerd_package }}=1.4.4-1"
- 'stable': "{{ containerd_package }}=1.4.4-1"
- 'edge': "{{ containerd_package }}=1.4.4-1"
+ '1.4.6': "{{ containerd_package }}=1.4.6-1"
+ 'stable': "{{ containerd_package }}=1.4.6-1"
+ 'edge': "{{ containerd_package }}=1.4.6-1"
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 0b2238130..2bcba470f 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -310,7 +310,7 @@ docker_plugins: []
etcd_kubeadm_enabled: false
# Containerd options
-containerd_version: 1.4.4
+containerd_version: 1.4.6
containerd_use_systemd_cgroup: true
# Settings for containerized control plane (etcd/kubelet/secrets)
--
GitLab