git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #116409 from jali-clarke/fix-coredns-import-on-arm64

nixos/kubernetes: import all platforms for seeded images

commit100cb81bbb67fe958a2a0786def57f0d6028d039 authorSarah Brofeldt <sbrofeldt@gmail.com> dateMon 15 Mar 2021, 19:22 (6 years ago) parent529607dcc582f1
1 file changed+2−2
nixos/modules/services/cluster/kubernetes/kubelet.nix+2−2
nixos/modules/services/cluster/kubernetes/kubelet.nix+2−2
@@ -276,9 +276,9 @@ in
276276 ${concatMapStrings (img: ''
277277 echo "Seeding container image: ${img}"
278278 ${if (lib.hasSuffix "gz" img) then
279− ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -''
279+ ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -''
280280 else
281− ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -''
281+ ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import --all-platforms -''
282282 }
283283 '') cfg.seedDockerImages}
284284