External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-07 09:27:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Bump docker_containerd to 1.6.32 (#11293)

Browse Source 
Signed-off-by: tu1h <lihai.tu@daocloud.io>
This commit is contained in:
Lihai Tu
2024-06-26 17:30:21 +08:00
committed by GitHub
parent cae266a045
commit 0c84175e3b
8 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}=1.6.18-1" '1.6.18': "{{ containerd_package }}=1.6.18-1"
'1.6.28': "{{ containerd_package }}=1.6.28-2" '1.6.28': "{{ containerd_package }}=1.6.28-2"
'1.6.31': "{{ containerd_package }}=1.6.31-1" '1.6.31': "{{ containerd_package }}=1.6.31-1"
'stable': "{{ containerd_package }}=1.6.31-1" '1.6.32': "{{ containerd_package }}=1.6.32-1"
'edge': "{{ containerd_package }}=1.6.31-1" 'stable': "{{ containerd_package }}=1.6.32-1"
'edge': "{{ containerd_package }}=1.6.32-1"
# https://download.docker.com/linux/debian/ # https://download.docker.com/linux/debian/
docker_versioned_pkg: docker_versioned_pkg:

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

@@ -24,8 +24,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.28': "{{ containerd_package }}-1.6.28-3.2.fc{{ ansible_distribution_major_version }}" '1.6.28': "{{ containerd_package }}-1.6.28-3.2.fc{{ ansible_distribution_major_version }}"
'1.6.31': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" '1.6.32': "{{ containerd_package }}-1.6.32-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" 'stable': "{{ containerd_package }}-1.6.32-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.32-3.1.fc{{ ansible_distribution_major_version }}"
# https://docs.docker.com/install/linux/docker-ce/fedora/ # https://docs.docker.com/install/linux/docker-ce/fedora/
# https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/ # https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/

5
roles/container-engine/docker/vars/kylin.yml
View File

@@ -29,8 +29,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el8" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el8"
'1.6.28': "{{ containerd_package }}-1.6.28-3.1.el8" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el8"
'1.6.31': "{{ containerd_package }}-1.6.31-3.1.el8" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el8"
'stable': "{{ containerd_package }}-1.6.31-3.1.el8" '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el8"
'edge': "{{ containerd_package }}-1.6.31-3.1.el8" 'stable': "{{ containerd_package }}-1.6.32-3.1.el8"
'edge': "{{ containerd_package }}-1.6.32-3.1.el8"
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/8/x86_64/stable/Packages/ # https://download.docker.com/linux/centos/8/x86_64/stable/Packages/

5
roles/container-engine/docker/vars/redhat-7.yml
View File

@@ -24,8 +24,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7"
'1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7"
'1.6.31': "{{ containerd_package }}-1.6.31-3.1.el7" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el7"
'stable': "{{ containerd_package }}-1.6.31-3.1.el7" '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el7"
'edge': "{{ containerd_package }}-1.6.31-3.1.el7" 'stable': "{{ containerd_package }}-1.6.32-3.1.el7"
'edge': "{{ containerd_package }}-1.6.32-3.1.el7"
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/

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

@@ -24,8 +24,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
'1.6.31': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" 'stable': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}"
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/

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

@@ -24,8 +24,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}=1.6.18-1" '1.6.18': "{{ containerd_package }}=1.6.18-1"
'1.6.28': "{{ containerd_package }}=1.6.28-2" '1.6.28': "{{ containerd_package }}=1.6.28-2"
'1.6.31': "{{ containerd_package }}=1.6.31-1" '1.6.31': "{{ containerd_package }}=1.6.31-1"
'stable': "{{ containerd_package }}=1.6.31-1" '1.6.32': "{{ containerd_package }}=1.6.32-1"
'edge': "{{ containerd_package }}=1.6.31-1" 'stable': "{{ containerd_package }}=1.6.32-1"
'edge': "{{ containerd_package }}=1.6.32-1"
# https://download.docker.com/linux/ubuntu/ # https://download.docker.com/linux/ubuntu/
docker_versioned_pkg: docker_versioned_pkg:

5
roles/container-engine/docker/vars/uniontech.yml
View File

@@ -21,8 +21,9 @@ containerd_versioned_pkg:
'1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}" '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" 'stable': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}"
docker_version: 19.03 docker_version: 19.03
docker_cli_version: 19.03 docker_cli_version: 19.03

2
roles/kubespray-defaults/defaults/main/download.yml
View File

@@ -84,7 +84,7 @@ containerd_version: 1.7.16
cri_dockerd_version: 0.3.11 cri_dockerd_version: 0.3.11
# this is relevant when container_manager == 'docker' # this is relevant when container_manager == 'docker'
docker_containerd_version: 1.6.28 docker_containerd_version: 1.6.32
# gcr and kubernetes image repo define # gcr and kubernetes image repo define
gcr_image_repo: "gcr.io" gcr_image_repo: "gcr.io"