git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/containerd: use v2 settings by default

Kubernetes is using v2 setting names and is the only module in Nixpkgs using containerd, so it makes sense to upgrade.

commitb6fbbe768db173f1126c2abb3d84d6d423ffe4da authorrnhmjoj <rnhmjoj@inventati.org> dateThu 23 Sep 2021, 00:18 (5 years ago) parentdc2cebd
1 file changed+5−2
nixos/modules/virtualisation/containerd.nix+5−2
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