From 9e4b801a592ceabe150ab1fef61681f7d116dfc6 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Thu, 20 Jan 2022 00:30:05 -0800
Subject: [PATCH] Build standalone containerd 1.6

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 scripts/version.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/version.sh b/scripts/version.sh
index 10ad48da7b..ed7e1869da 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -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