diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-08 12:39:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 12:39:37 +0100 |
| commit | 1a0b8047999f117830a2c4b63362a807b49ca44e (patch) | |
| tree | d8bb60a8caeb7b514b7e0867db304f3ecc1ea50d /nixos/modules/services | |
| parent | 0ffade9012d2fd2574208cabdb7dc4030f30f33c (diff) | |
| parent | e6d1c597f137ee8a4439d7d9c3d24e22b86eb03c (diff) | |
| download | nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.tar nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.tar.gz nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.tar.bz2 nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.tar.lz nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.tar.xz nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.tar.zst nixpkgs-1a0b8047999f117830a2c4b63362a807b49ca44e.zip | |
Merge pull request #162866 from euank/k3s-unified-cgroups
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/cluster/k3s/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 50b6780bbe6..3a36cfa3f37 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 = { @@ -119,6 +114,7 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] ++ (optional cfg.docker "--docker") + ++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") |