summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorngerstle <ngerstle@gmail.com>2021-08-16 23:34:10 +0200
committerEuan Kemp <euank@euank.com>2022-03-05 00:18:17 -0800
commit8aaa0699db4ecbae35314144cbef1d95bf2c61ed (patch)
tree2c3ec24bd9328da433b1266ed17191c4467ccd9b /nixos
parent989e6b7bc134dfc47a6daf2f5f2b6f4356040c5d (diff)
downloadnixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.tar
nixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.tar.gz
nixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.tar.bz2
nixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.tar.lz
nixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.tar.xz
nixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.tar.zst
nixpkgs-8aaa0699db4ecbae35314144cbef1d95bf2c61ed.zip
k3s: enable enableUnifiedCgroupHierarchy
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/cluster/k3s/default.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index 50b6780bbe6..7bda11afedf 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -91,11 +91,6 @@ in
     virtualisation.docker = mkIf cfg.docker {
       enable = mkDefault true;
     };
-
-    # TODO: disable this once k3s supports cgroupsv2, either by docker
-    # supporting it, or their bundled containerd
-    systemd.enableUnifiedCgroupHierarchy = false;
-
     environment.systemPackages = [ config.services.k3s.package ];
 
     systemd.services.k3s = {