External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

update containerd to version 1.4.6 (#7674)

Browse Source
This commit is contained in:
Sergey
2021-06-03 20:55:38 +03:00
committed by GitHub
parent 7036b704b3
commit d9d29af87f
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/container-engine/containerd-common/vars/amazon.yml
View File

@@ -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 }}"

5
roles/container-engine/containerd-common/vars/debian.yml
View File

@@ -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"

5
roles/container-engine/containerd-common/vars/fedora.yml
View File

@@ -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 }}"

5
roles/container-engine/containerd-common/vars/redhat.yml
View File

@@ -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 }}"

5
roles/container-engine/containerd-common/vars/ubuntu.yml
View File

@@ -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"

2
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -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)