Unverified Commit 4ab1021a authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

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

nixos/cri-o: add aufs, devmapper, and zfs to storageDrivers
parents 25e21b34 8ae1412f

nixos/modules/virtualisation/cri-o.nix

+5 −2
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ with lib; 
let

  cfg = config.virtualisation.cri-o;



  crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });

  crioPackage = pkgs.cri-o.override {

    extraPackages = cfg.extraPackages

      ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;

  };



  format = pkgs.formats.toml { };
@@ -19,7 +22,7 @@ in 
    enable = mkEnableOption (lib.mdDoc "Container Runtime Interface for OCI (CRI-O)");



    storageDriver = mkOption {

      type = types.enum [ "btrfs" "overlay" "vfs" ];

      type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ];

      default = "overlay";

      description = lib.mdDoc "Storage driver to be used";

    };

pkgs/applications/virtualization/cri-o/wrapper.nix

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, lib

, extraPackages ? []

, runc # Default container runtime

, conntrack-tools

, crun # Container runtime (default with cgroups v2 for podman/buildah)

, conmon # Container runtime monitor

, util-linux # nsenter
@@ -13,6 +14,7 @@ 
let

  binPath = lib.makeBinPath ([

    runc

    conntrack-tools

    crun

    conmon

    util-linux