From 278f0be608db24015927ed4a23e3d16b9f421a62 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 12 Dec 2024 12:36:30 +0100 Subject: [PATCH] nixos/kubernetes/kubelet: Fix sandbox image load on containerd 2.x --- nixos/modules/services/cluster/kubernetes/kubelet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index f481f70b84c3..98f601d8886e 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -345,9 +345,9 @@ in echo "Seeding container image: ${img}" ${ if (lib.hasSuffix "gz" img) then - ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -'' + ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -'' else - ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -'' + ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -'' } '') cfg.seedDockerImages}