Merge pull request #116409 from jali-clarke/fix-coredns-import-on-arm64

nixos/kubernetes: import all platforms for seeded images
This commit is contained in:
Sarah Brofeldt 2021-03-15 19:22:28 +01:00 committed by GitHub
commit 100cb81bbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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}