summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-11-19 00:36:04 +0100
committerFlorian Klink <flokli@flokli.de>2020-11-19 16:56:46 +0100
commit5d45f269aac3a89550c39ee90bbcf70c711b84dd (patch)
tree18d8f4b4892745d342d40c424cbc806b0cb5a29a /nixos
parentd22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c (diff)
downloadnixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.tar
nixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.tar.gz
nixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.tar.bz2
nixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.tar.lz
nixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.tar.xz
nixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.tar.zst
nixpkgs-5d45f269aac3a89550c39ee90bbcf70c711b84dd.zip
nixos/k3s: disable unifiedCgroupHierarchy
This gets automatically disabled by docker if the docker backend is
used, but the bundled containerd also doesn't seem to support cgroupsv2,
so disable it explicitly here, too.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/cluster/k3s/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index 2e8bf20a68f..f0317fdbd16 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -76,6 +76,10 @@ in
       enable = mkDefault true;
     };
 
+    # TODO: disable this once k3s supports cgroupsv2, either by docker
+    # supporting it, or their bundled containerd
+    systemd.enableUnifiedCgroupHierarchy = false;
+
     systemd.services.k3s = {
       description = "k3s service";
       after = mkIf cfg.docker [ "docker.service" ];