Update containerd to fix long exec issue.

Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-30 18:23:14 +00:00
parent d4ee7aacc5
commit 5ed43ea1a3
31 changed files with 356 additions and 174 deletions
--- a/hack/verify-lint.sh
+++ b/hack/verify-lint.sh
@@ -32,5 +32,5 @@ for d in $(find . -type d -a \( -iwholename './pkg*' -o -iwholename './cmd*' \)
 		 --cyclo-over=60 \
 		 --dupl-threshold=100 \
 		 --tests \
-		 --deadline=300s "${d}"
+		 --deadline=600s "${d}"
 done
--- a/hack/versions
+++ b/hack/versions
@@ -1,5 +1,5 @@
 RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4
 CNI_VERSION=v0.6.0
-CONTAINERD_VERSION=118c0a279eaf600f6021178427df14345aef4177
+CONTAINERD_VERSION=8114d2f2e255b9bd06c6d4377eb235ca809fc895
 CRITOOL_VERSION=4cd2b047a26a2ef01bbd02ee55f7d70d8825ebb5
 KUBERNETES_VERSION=164317879bcd810b97e5ebf1c8df041770f2ff1b