Skip to content

K
k3s
Commit 9e4b801a authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Build standalone containerd 1.6

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 4a3d283b
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
scripts/version.sh
View file @ 9e4b801a
...@@ -22,10 +22,9 @@ if [ -d .git ]; then ...@@ -22,10 +22,9 @@ if [ -d .git ]; then
fi fi
fi fi
VERSION_CONTAINERD=$(grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}') # We're building k3s against containerd 1.5 in go.mod because 1.6 has dependency
if [ -z "$VERSION_CONTAINERD" ]; then # conflicts with Kubernetes, but we still need to bundle containerd 1.6.
VERSION_CONTAINERD="v0.0.0" VERSION_CONTAINERD="v1.6.4-k3s1"
fi
VERSION_CRICTL=$(grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}') VERSION_CRICTL=$(grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}')
if [ -z "$VERSION_CRICTL" ]; then if [ -z "$VERSION_CRICTL" ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment