From 0c84175e3b17dcb593d720ee4ae88f0396620c7d Mon Sep 17 00:00:00 2001
From: Lihai Tu <92532497+tu1h@users.noreply.github.com>
Date: Wed, 26 Jun 2024 17:30:21 +0800
Subject: [PATCH] Bump docker_containerd to 1.6.32 (#11293)

Signed-off-by: tu1h <lihai.tu@daocloud.io>
---
 roles/container-engine/docker/vars/debian.yml       | 5 +++--
 roles/container-engine/docker/vars/fedora.yml       | 5 +++--
 roles/container-engine/docker/vars/kylin.yml        | 5 +++--
 roles/container-engine/docker/vars/redhat-7.yml     | 5 +++--
 roles/container-engine/docker/vars/redhat.yml       | 5 +++--
 roles/container-engine/docker/vars/ubuntu.yml       | 5 +++--
 roles/container-engine/docker/vars/uniontech.yml    | 5 +++--
 roles/kubespray-defaults/defaults/main/download.yml | 2 +-
 8 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index 39d82f47d..f6d14d4fb 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/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:
diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml
index 9fe6c5c24..392e5536d 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/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/
diff --git a/roles/container-engine/docker/vars/kylin.yml b/roles/container-engine/docker/vars/kylin.yml
index 7531a9d71..d79cf8330 100644
--- a/roles/container-engine/docker/vars/kylin.yml
+++ b/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/
diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml
index 0af670351..26ec59ccc 100644
--- a/roles/container-engine/docker/vars/redhat-7.yml
+++ b/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/
diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml
index ad1105a66..deead325c 100644
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/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/
diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml
index c753af395..636e41732 100644
--- a/roles/container-engine/docker/vars/ubuntu.yml
+++ b/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:
diff --git a/roles/container-engine/docker/vars/uniontech.yml b/roles/container-engine/docker/vars/uniontech.yml
index 0749726d1..13e1cd673 100644
--- a/roles/container-engine/docker/vars/uniontech.yml
+++ b/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
diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml
index 0bd1ac503..ca21d4407 100644
--- a/roles/kubespray-defaults/defaults/main/download.yml
+++ b/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"
-- 
GitLab