Browse Source

Bump docker_containerd to 1.6.32 (#11293)

Signed-off-by: tu1h <lihai.tu@daocloud.io>
pull/11258/head
Lihai Tu 9 months ago
committed by GitHub
parent
commit
0c84175e3b
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
8 changed files with 22 additions and 15 deletions
  1. 5
      roles/container-engine/docker/vars/debian.yml
  2. 5
      roles/container-engine/docker/vars/fedora.yml
  3. 5
      roles/container-engine/docker/vars/kylin.yml
  4. 5
      roles/container-engine/docker/vars/redhat-7.yml
  5. 5
      roles/container-engine/docker/vars/redhat.yml
  6. 5
      roles/container-engine/docker/vars/ubuntu.yml
  7. 5
      roles/container-engine/docker/vars/uniontech.yml
  8. 2
      roles/kubespray-defaults/defaults/main/download.yml

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

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

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

@ -24,8 +24,9 @@ containerd_versioned_pkg:
'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.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 }}"
'edge': "{{ 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 }}"
'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://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/

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

@ -29,8 +29,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}-1.6.18-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"
'stable': "{{ containerd_package }}-1.6.31-3.1.el8"
'edge': "{{ containerd_package }}-1.6.31-3.1.el8"
'1.6.32': "{{ containerd_package }}-1.6.32-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://download.docker.com/linux/centos/8/x86_64/stable/Packages/

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

@ -24,8 +24,9 @@ containerd_versioned_pkg:
'1.6.18': "{{ containerd_package }}-1.6.18-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"
'stable': "{{ containerd_package }}-1.6.31-3.1.el7"
'edge': "{{ containerd_package }}-1.6.31-3.1.el7"
'1.6.32': "{{ containerd_package }}-1.6.32-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://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/

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

@ -24,8 +24,9 @@ containerd_versioned_pkg:
'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.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 }}"
'edge': "{{ 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 }}"
'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://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/

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

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

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

@ -21,8 +21,9 @@ containerd_versioned_pkg:
'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.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 }}"
'edge': "{{ 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 }}"
'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_cli_version: 19.03

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

@ -84,7 +84,7 @@ containerd_version: 1.7.16
cri_dockerd_version: 0.3.11
# 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_image_repo: "gcr.io"

Loading…
Cancel
Save