From cc582f1f59fc2ee617127163c95aa79edb9df6de Mon Sep 17 00:00:00 2001 From: jali-clarke Date: Mon, 15 Mar 2021 08:59:56 -0400 Subject: [PATCH] nixos/kubernetes: import all platforms for seeded images This fixes a class of errors seen on aarch64 during coredns import where content was seen to be missing ("digest xxx not found") or "failed to get reader from content store" depending on which coredns version was being imported. --- 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 ef6da26a024..7efcf8ac6c5 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -276,9 +276,9 @@ in ${concatMapStrings (img: '' 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 -'' + ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -'' else - ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -'' + ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -'' } '') cfg.seedDockerImages}