!97 upgrade to contained 1.6.21

From: @vegbir 
Reviewed-by: @zhong-jiawei-1, @duguhaotian 
Signed-off-by: @duguhaotian

apply-patch

@@ -7,11 +7,11 @@
 
 set -ex
 
-pkg=containerd-1.6.20
+pkg=containerd-1.6.21
 cwd=$PWD
 src=$cwd/$pkg
 
-unzip v1.6.20.zip
+unzip v1.6.21.zip
 if [[ ! -d patch ]]; then
     tar zxf patch.tar.gz
 fi
@@ -35,4 +35,4 @@ done <"$series"
 cd $cwd
 cp -rf $src/* .
 mv $src/.git $cwd/.git
-rm -rf containerd-1.6.20
+rm -rf containerd-1.6.21

containerd.spec

@@ -1,12 +1,12 @@
 %global goipath github.com/containerd/containerd
 %global debug_package %{nil}
-Version:        1.6.20
+Version:        1.6.21
 Name:           containerd
-Release:        3
+Release:        1
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
-Source0:        https://github.com/containerd/containerd/archive/v1.6.20.zip
+Source0:        https://github.com/containerd/containerd/archive/v1.6.21.zip
 Source1:        patch.tar.gz
 Source2:        apply-patch
 Source3:        series.conf
@@ -67,6 +67,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml
 %exclude %{_bindir}/containerd-stress
 
 %changelog
+* Fri July 21 2023 vegbir<yangjiaqi16@huawei.com> - 1.6.21-1
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:upgrade to contained 1.6.21
+
 * Mon May 15 2023 zhangzhihui<zhangzhihui@xfusion.com> - 1.6.20-3
 - Type:bugfix
 - ID:NA

git-commit

@@ -1 +1 @@
-d2dfb1444fe48c86b6bbb291358d5b3f581d3b82
+aca8b96e269f3f28352f257b79e1fd53550fa91a