summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-09-23 00:21:40 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2021-09-23 00:21:40 +0200
commit6de529c64abcd435f64e1b3fd521efcf5d87a741 (patch)
tree91effea3d024d78835f7e500ef8f62e60c38d333 /nixos
parentb6fbbe768db173f1126c2abb3d84d6d423ffe4da (diff)
downloadnixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.tar
nixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.tar.gz
nixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.tar.bz2
nixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.tar.lz
nixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.tar.xz
nixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.tar.zst
nixpkgs-6de529c64abcd435f64e1b3fd521efcf5d87a741.zip
nixos/kubernetes: fix containerd settings
mkDefault must be applied to each setting individually, otherwise a
single change to `containerd.settings` replaces the whole attribute set.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/cluster/kubernetes/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index f2c76a56d8d..08b21418180 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -253,7 +253,7 @@ in {
     (mkIf cfg.kubelet.enable {
       virtualisation.containerd = {
         enable = mkDefault true;
-        settings = mkDefault defaultContainerdSettings;
+        settings = mapAttrsRecursive (name: mkDefault) defaultContainerdSettings;
       };
     })