Build standalone containerd 1.6

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/5548/head
Brad Davidson 2022-01-20 00:30:05 -08:00 committed by Brad Davidson
parent 4a3d283bc1
commit 9e4b801a59
1 changed files with 3 additions and 4 deletions

View File

@ -22,10 +22,9 @@ if [ -d .git ]; then
fi
fi
VERSION_CONTAINERD=$(grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}')
if [ -z "$VERSION_CONTAINERD" ]; then
VERSION_CONTAINERD="v0.0.0"
fi
# We're building k3s against containerd 1.5 in go.mod because 1.6 has dependency
# conflicts with Kubernetes, but we still need to bundle containerd 1.6.
VERSION_CONTAINERD="v1.6.4-k3s1"
VERSION_CRICTL=$(grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}')
if [ -z "$VERSION_CRICTL" ]; then