From d355b43dced0910fa0d77701f31bd7e12c9eaf75 Mon Sep 17 00:00:00 2001 From: Cristian Calin <6627509+cristicalin@users.noreply.github.com> Date: Mon, 6 Sep 2021 14:50:29 +0300 Subject: [PATCH] ContainerD: bump containerd version to 1.4.9 (#7940) --- 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 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/roles/container-engine/containerd-common/vars/debian.yml b/roles/container-engine/containerd-common/vars/debian.yml index 2832884e5..184eb8f10 100644 --- a/roles/container-engine/containerd-common/vars/debian.yml +++ b/roles/container-engine/containerd-common/vars/debian.yml @@ -6,5 +6,6 @@ containerd_versioned_pkg: '1.4.3': "{{ containerd_package }}=1.4.3-2" '1.4.4': "{{ 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" + '1.4.9': "{{ containerd_package }}=1.4.9-1" + 'stable': "{{ containerd_package }}=1.4.9-1" + 'edge': "{{ containerd_package }}=1.4.9-1" diff --git a/roles/container-engine/containerd-common/vars/fedora.yml b/roles/container-engine/containerd-common/vars/fedora.yml index 7c712c18e..011910adc 100644 --- a/roles/container-engine/containerd-common/vars/fedora.yml +++ b/roles/container-engine/containerd-common/vars/fedora.yml @@ -6,5 +6,6 @@ containerd_versioned_pkg: '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 }}" '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 }}" + '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 }}" diff --git a/roles/container-engine/containerd-common/vars/redhat.yml b/roles/container-engine/containerd-common/vars/redhat.yml index f8018a184..58edb8ba3 100644 --- a/roles/container-engine/containerd-common/vars/redhat.yml +++ b/roles/container-engine/containerd-common/vars/redhat.yml @@ -6,5 +6,6 @@ containerd_versioned_pkg: '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 }}" '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 }}" + '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 }}" diff --git a/roles/container-engine/containerd-common/vars/ubuntu.yml b/roles/container-engine/containerd-common/vars/ubuntu.yml index 2832884e5..184eb8f10 100644 --- a/roles/container-engine/containerd-common/vars/ubuntu.yml +++ b/roles/container-engine/containerd-common/vars/ubuntu.yml @@ -6,5 +6,6 @@ containerd_versioned_pkg: '1.4.3': "{{ containerd_package }}=1.4.3-2" '1.4.4': "{{ 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" + '1.4.9': "{{ containerd_package }}=1.4.9-1" + 'stable': "{{ containerd_package }}=1.4.9-1" + 'edge': "{{ containerd_package }}=1.4.9-1" diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index b64588ed8..9d6384019 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -322,7 +322,7 @@ docker_plugins: [] etcd_kubeadm_enabled: false # Containerd options -containerd_version: 1.4.6 +containerd_version: 1.4.9 containerd_use_systemd_cgroup: true # Settings for containerized control plane (etcd/kubelet/secrets)