b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #139026 from rnhmjoj/kube-fix

Browse source 
nixos/kubernetes: fix containerd settings
This commit is contained in:
Michele Guerini Rocco 2021-09-23 17:35:13 +02:00 committed by GitHub
parent 078c3bfb54 6de529c64a
commit 51bcdc4cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/cluster/kubernetes/default.nix
View file

@ -253,7 +253,7 @@ in {
(mkIf cfg.kubelet.enable {
virtualisation.containerd = {
enable = mkDefault true;
settings = mkDefault defaultContainerdSettings;
settings = mapAttrsRecursive (name: mkDefault) defaultContainerdSettings;
};
})

7
nixos/modules/virtualisation/containerd.nix
View file

@ -53,8 +53,11 @@ in
virtualisation.containerd = {
args.config = toString containerdConfigChecked;
settings = {
plugins.cri.containerd.snapshotter = lib.mkIf config.boot.zfs.enabled "zfs";
plugins.cri.cni.bin_dir = lib.mkDefault "${pkgs.cni-plugins}/bin";
plugins."io.containerd.grpc.v1.cri" = {
containerd.snapshotter =
lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs");
cni.bin_dir = lib.mkOptionDefault "${pkgs.cni-plugins}/bin";
};
};
};