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.
2021-09-23 00:18:58 +02:00
parent dc2cebde00
commit b6fbbe768d
1 changed files with 5 additions and 2 deletions
@@ -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";
+        };
      };
    };