Merge pull request #4679 from mikebrow/update-util-versions

fuweid · web-flow · commit 81cf375ec877 · 2020-11-01T18:56:59.000+08:00
updates cri-tools to latest version
diff --git a/hack/utils.sh b/hack/utils.sh
@@ -18,7 +18,9 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
 # Not from vendor.conf.
 KUBERNETES_VERSION="v1.19.0-beta.2"
-CRITOOL_VERSION=${CRITOOL_VERSION:-baca4a152dfe671fc17911a7af74bcb61680ee39}
+# TODO: (mikebrow) these version values need to be normalized now with the containerd CI setup & tests
+# see https://github.com/containerd/containerd/blob/master/script/setup/install-critools#L24
+CRITOOL_VERSION=${CRITOOL_VERSION:-0f5f734a7e1da0979915c6e7d5b6641bd9dc2627}
 CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools
 CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools
 
diff --git a/script/setup/install-critools b/script/setup/install-critools
@@ -21,7 +21,7 @@
 set -eu -o pipefail
 
 go get -u github.com/onsi/ginkgo/ginkgo
-CRITEST_COMMIT=2bf7674922a424337d7580a08166d666c6802818 # v1.18.0-100-g2bf7674
+CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
 go get -d github.com/kubernetes-sigs/cri-tools/...
 cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
 git checkout $CRITEST_COMMIT
