diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-23 00:18:58 +0200 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-23 00:18:58 +0200 |
commit | b6fbbe768db173f1126c2abb3d84d6d423ffe4da (patch) | |
tree | 31f04a6a0d435f12413aa6f22f70ca65cf0eda0c /nixos | |
parent | dc2cebde006c6b7f26565cee9f8aaf4e55ba56fb (diff) |
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.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/containerd.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 43cb6273f253a..898a66e7b04e3 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -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"; + }; }; }; |