MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/cluster/kubernetes/kubelet.nix
View file

@ -276,9 +276,9 @@ in
${concatMapStrings (img: '' ${concatMapStrings (img: ''
echo "Seeding container image: ${img}" echo "Seeding container image: ${img}"
${if (lib.hasSuffix "gz" img) then ${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 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} '') cfg.seedDockerImages}