From 40c276ec6a80394252f96d7c4dbc3d89c5c8bb70 Mon Sep 17 00:00:00 2001
From: kranurag7 <81210977+kranurag7@users.noreply.github.com>
Date: Wed, 27 Nov 2024 03:27:57 +0000
Subject: [PATCH] pin containerd to 1.7.22 version for k3s

containerd-shim-runc-v2 is now pulling in versions > 2.0.0 by default. (https://github.com/containerd/containerd/issues/10984)
pinning is required because any version >2.0.0 is not compatible with daemon < 2.0.0
daemon in this case is coming from k3s itself and upstream k3s project have not migrated yet to version > 2.0.0
there's is an issue tracking k3s update to containerd > 2.0.0 (https://github.com/k3s-io/k3s/issues/11375)
remove pin once upstream migrates to containerd > 2.0.0

Signed-off-by: kranurag7 <81210977+kranurag7@users.noreply.github.com>
---
 k3s.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/k3s.yaml b/k3s.yaml
index 6a8246048ba..e660fe744f7 100644
--- a/k3s.yaml
+++ b/k3s.yaml
@@ -1,7 +1,7 @@
 package:
   name: k3s
   version: 1.31.2.1
-  epoch: 3
+  epoch: 4
   description:
   copyright:
     - license: Apache-2.0
@@ -9,7 +9,12 @@ package:
     runtime:
       - busybox
       - conntrack-tools
-      - containerd-shim-runc-v2
+      # containerd-shim-runc-v2 is now pulling in versions > 2.0.0 by default. (https://github.com/containerd/containerd/issues/10984)
+      # pinning is required because any version >2.0.0 is not compatible with daemon < 2.0.0
+      # daemon in this case is coming from k3s itself and they've not migrated yet to version > 2.0.0
+      # there's is an issue tracking k3s update to containerd > 2.0.0 (https://github.com/k3s-io/k3s/issues/11375)
+      # remove pin once upstream migrates to containerd > 2.0.0
+      - containerd-shim-runc-v2=~1.7.22
       - ip6tables # this pulls in iptables as well
       - kmod
       - libseccomp