summary refs log tree commit diff
path: root/nixos/modules/services/cluster/kubernetes
diff options
context:
space:
mode:
authorjali-clarke <jaliclarke@freshbooks.com>2021-03-15 08:59:56 -0400
committerjali-clarke <jaliclarke@freshbooks.com>2021-03-15 09:03:40 -0400
commitcc582f1f59fc2ee617127163c95aa79edb9df6de (patch)
tree2565d39f78557d8ee0749597ad072e499fabfbff /nixos/modules/services/cluster/kubernetes
parent22a56ecc930d113443894ddbd89a12e9b3524f46 (diff)
downloadnixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.tar
nixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.tar.gz
nixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.tar.bz2
nixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.tar.lz
nixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.tar.xz
nixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.tar.zst
nixpkgs-cc582f1f59fc2ee617127163c95aa79edb9df6de.zip
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.
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes')
-rw-r--r--nixos/modules/services/cluster/kubernetes/kubelet.nix4
1 files 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}