Skip to content

Commit 81cf375

Browse files
authored
Merge pull request #4679 from mikebrow/update-util-versions
updates cri-tools to latest version
2 parents ea56dd3 + 63f673a commit 81cf375

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

hack/utils.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
1818

1919
# Not from vendor.conf.
2020
KUBERNETES_VERSION="v1.19.0-beta.2"
21-
CRITOOL_VERSION=${CRITOOL_VERSION:-baca4a152dfe671fc17911a7af74bcb61680ee39}
21+
# TODO: (mikebrow) these version values need to be normalized now with the containerd CI setup & tests
22+
# see https://github.com/containerd/containerd/blob/master/script/setup/install-critools#L24
23+
CRITOOL_VERSION=${CRITOOL_VERSION:-0f5f734a7e1da0979915c6e7d5b6641bd9dc2627}
2224
CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools
2325
CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools
2426

script/setup/install-critools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
set -eu -o pipefail
2222

2323
go get -u github.com/onsi/ginkgo/ginkgo
24-
CRITEST_COMMIT=2bf7674922a424337d7580a08166d666c6802818 # v1.18.0-100-g2bf7674
24+
CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
2525
go get -d github.com/kubernetes-sigs/cri-tools/...
2626
cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
2727
git checkout $CRITEST_COMMIT

0 commit comments

Comments
 (0)