From d4c63720e9e477224ef4e66ed843310abf06412b Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 30 Sep 2019 13:14:30 -0700 Subject: [PATCH 1/8] update containerd binary v1.3.0 full diff: https://github.com/containerd/containerd/compare/v1.2.8..v1.3.0 Signed-off-by: Sebastiaan van Stijn Signed-off-by: Derek McGowan (cherry picked from commit 6c94a50f4198fffa44f93d627044f1ca43545081) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 098f7c8c45977..0b5f8fe4a5714 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: ${CONTAINERD_COMMIT:=7ad184331fa3e55e52b890ea95e65ba581ae3429} # v1.2.13 +: ${CONTAINERD_COMMIT:=36cf5b690dcc00ff0f34ff7799209050c3d0c59a} # v1.3.0 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From 56d897347dff32c6be23a3936db9fe0545cec0a9 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Wed, 20 Nov 2019 23:23:07 +0800 Subject: [PATCH 2/8] Update containerd to v1.3.1 Signed-off-by: Jintao Zhang (cherry picked from commit 517946eb470458ec6b29bb0e2d18fe2e57332769) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 0b5f8fe4a5714..b2367aaf426e6 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: ${CONTAINERD_COMMIT:=36cf5b690dcc00ff0f34ff7799209050c3d0c59a} # v1.3.0 +: ${CONTAINERD_COMMIT:=c7a4f874b3267c499484aae602d1257b12d69e40} # v1.3.1 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From 490c45b75682879891e73c7f08ae90e69a98012d Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Mon, 9 Dec 2019 01:23:40 +0800 Subject: [PATCH 3/8] Update containerd to v1.3.2 Signed-off-by: Jintao Zhang (cherry picked from commit 7f809e1080077469c26d7c9e3d7ef71151aa2faf) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index b2367aaf426e6..201283c09a4dd 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: ${CONTAINERD_COMMIT:=c7a4f874b3267c499484aae602d1257b12d69e40} # v1.3.1 +: ${CONTAINERD_COMMIT:=ff48f57fc83a8c44cf4ad5d672424a98ba37ded6} # v1.3.2 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From 89a4208757fcf3405a9a96ec0765a099207be7c2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 7 Feb 2020 10:21:01 +0100 Subject: [PATCH 4/8] update containerd binary to v1.3.3 full diff: https://github.com/containerd/containerd/compare/v1.3.2...v1.3.3 release notes: https://github.com/containerd/containerd/releases/tag/v1.3.3 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 27649ee44f841f5804c9aa02ac59091ea2858e36) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 201283c09a4dd..723a8bd958562 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: ${CONTAINERD_COMMIT:=ff48f57fc83a8c44cf4ad5d672424a98ba37ded6} # v1.3.2 +: "${CONTAINERD_COMMIT:=d76c121f76a5fc8a462dc64594aea72fe18e1178}" # v1.3.3 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From fc8f88dc1454f4f66b20f4d480b5adc164d17df8 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Thu, 16 Apr 2020 14:36:38 +0800 Subject: [PATCH 5/8] update containerd to v1.3.4 Signed-off-by: Jintao Zhang (cherry picked from commit fbaaca63519004f6c170eecc131c52f44281d424) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 723a8bd958562..55eca9d104b96 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: "${CONTAINERD_COMMIT:=d76c121f76a5fc8a462dc64594aea72fe18e1178}" # v1.3.3 +: "${CONTAINERD_COMMIT:=814b7956fafc7a0980ea07e950f983d0837e5578}" # v1.3.4 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From 80cef48453cd4542fe7a5d8477ebcda115db9abb Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Sat, 27 Jun 2020 11:09:38 +0800 Subject: [PATCH 6/8] update containerd to v1.3.5 Signed-off-by: Jintao Zhang (cherry picked from commit 0e915e5413c5e1554fb20884361cd30b7f0c50fc) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 55eca9d104b96..916debe92cefd 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: "${CONTAINERD_COMMIT:=814b7956fafc7a0980ea07e950f983d0837e5578}" # v1.3.4 +: "${CONTAINERD_COMMIT:=9b6f3ec0307a825c38617b93ad55162b5bb94234}" # v1.3.5 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From 9380ec739718bfb5a7d9ca4a412ca212b7346f56 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Thu, 2 Jul 2020 00:12:56 +0800 Subject: [PATCH 7/8] update containerd to v1.3.6 Signed-off-by: Jintao Zhang (cherry picked from commit 85e3dddccdf74892dac74aa47de8cd2561147e08) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 916debe92cefd..a9c30f7626f65 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: "${CONTAINERD_COMMIT:=9b6f3ec0307a825c38617b93ad55162b5bb94234}" # v1.3.5 +: "${CONTAINERD_COMMIT:=be75852b8d7849474a20192f9ed1bf34fdd454f1}" # v1.3.6 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT" From a15a770e1ba824fd776c59d08a34174fb61af05b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 4 Aug 2020 14:47:57 +0900 Subject: [PATCH 8/8] update containerd to v1.3.7 Release note: https://github.com/containerd/containerd/releases/tag/v1.3.7 Signed-off-by: Akihiro Suda (cherry picked from commit 43d13054c5718800b6f010509fa00c662143ff13) Signed-off-by: Sebastiaan van Stijn --- hack/dockerfile/install/containerd.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index a9c30f7626f65..7fcd0c7fbc5f1 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -4,7 +4,7 @@ # containerd is also pinned in vendor.conf. When updating the binary # version you may also need to update the vendor version to pick up bug # fixes or new APIs. -: "${CONTAINERD_COMMIT:=be75852b8d7849474a20192f9ed1bf34fdd454f1}" # v1.3.6 +: "${CONTAINERD_COMMIT:=8fba4e9a7d01810a393d5d25a3621dc101981175}" # v1.3.7 install_containerd() { echo "Install containerd version $CONTAINERD_COMMIT"