diff --git a/roles/container-engine/containerd-common/vars/debian.yml b/roles/container-engine/containerd-common/vars/debian.yml index 2832884e526d7832036675ace72b2bf74afa71a6..184eb8f10ed4ee01794d3ad43fb97446e5074ea7 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 7c712c18e3677807da3b10d58947e82219caf2fc..011910adc8ff3ff08b43b340cf7354abb5e3d793 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 f8018a184b1d6e2f47cf8c41febac019d0fad2db..58edb8ba341d68a717ace1c35da4109f8fc4468e 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 2832884e526d7832036675ace72b2bf74afa71a6..184eb8f10ed4ee01794d3ad43fb97446e5074ea7 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 b64588ed8fde6b8e3914e4a6e367f93847dcc7c2..9d6384019dfcdb575fe1c843930fbef45625c311 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)