pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #213036 from SuperSandro2000/cri-o/update_storagedrivers

nixos/cri-o: add aufs, devmapper, and zfs to storageDrivers

authored by

adisbladis and committed by
GitHub 4ab1021a 25e21b34

+7 -2
unified split
+5 -2
nixos/modules/virtualisation/cri-o.nix
··· 4 4 let 5 5 cfg = config.virtualisation.cri-o; 6 6 7 - crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); 7 + crioPackage = pkgs.cri-o.override { 8 + extraPackages = cfg.extraPackages 9 + ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; 10 + }; 8 11 9 12 format = pkgs.formats.toml { }; 10 13 ··· 19 22 enable = mkEnableOption (lib.mdDoc "Container Runtime Interface for OCI (CRI-O)"); 20 23 21 24 storageDriver = mkOption { 22 - type = types.enum [ "btrfs" "overlay" "vfs" ]; 25 + type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ]; 23 26 default = "overlay"; 24 27 description = lib.mdDoc "Storage driver to be used"; 25 28 };
+2
pkgs/applications/virtualization/cri-o/wrapper.nix
··· 4 4 , lib 5 5 , extraPackages ? [] 6 6 , runc # Default container runtime 7 + , conntrack-tools 7 8 , crun # Container runtime (default with cgroups v2 for podman/buildah) 8 9 , conmon # Container runtime monitor 9 10 , util-linux # nsenter ··· 13 14 let 14 15 binPath = lib.makeBinPath ([ 15 16 runc 17 + conntrack-tools 16 18 crun 17 19 conmon 18 20 util-linux