Merge pull request #139026 from rnhmjoj/kube-fix
nixos/kubernetes: fix containerd settings
commit51bcdc4cdaac48535dabf0ad4642a66774c609ed
authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com>
dateThu 23 Sep 2021, 17:35 (5 years ago)
parent078c3bf6de529c
nixos/modules/services/cluster/kubernetes/default.nix+1−1
@@ -253,7 +253,7 @@ in {
253253 (mkIf cfg.kubelet.enable {
254254 virtualisation.containerd = {
255255 enable = mkDefault true;
256− settings = mkDefault defaultContainerdSettings;
256+ settings = mapAttrsRecursive (name: mkDefault) defaultContainerdSettings;
257257 };
258258 })
259259
nixos/modules/virtualisation/containerd.nix+5−2
@@ -53,8 +53,11 @@ in
5353 virtualisation.containerd = {
5454 args.config = toString containerdConfigChecked;
5555 settings = {
56− plugins.cri.containerd.snapshotter = lib.mkIf config.boot.zfs.enabled "zfs";
57− plugins.cri.cni.bin_dir = lib.mkDefault "${pkgs.cni-plugins}/bin";
56+ plugins."io.containerd.grpc.v1.cri" = {
57+ containerd.snapshotter =
58+ lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs");
59+ cni.bin_dir = lib.mkOptionDefault "${pkgs.cni-plugins}/bin";
60+ };
5861 };
5962 };
6063