diff options
| author | Euan Kemp <euank@euank.com> | 2022-07-19 01:58:25 -0700 |
|---|---|---|
| committer | Euan Kemp <euank@euank.com> | 2022-07-19 02:52:12 -0700 |
| commit | f158ac45eff3cd023af83c43b22573dd71b85e59 (patch) | |
| tree | 62cf63590bb3e779508b6ae8bed537727484f722 /nixos/modules/services/cluster | |
| parent | d2db10786f27619d5519b12b03fb10dc8ca95e59 (diff) | |
| download | nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.tar nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.tar.gz nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.tar.bz2 nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.tar.lz nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.tar.xz nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.tar.zst nixpkgs-f158ac45eff3cd023af83c43b22573dd71b85e59.zip | |
nixos/k3s: use default cgroup-driver again
Setting `cgroup-driver=systemd` was originally necessary to match with docker, else the kubelet would not start (#111835) However, since then, docker support has been dropped from k3s (#177790). As such, this option is much less necessary. More importantly, it now seems to be actively causing issues. Due to an upstream k3s bug, it's resulting in the kubelet and containerd having different cgroup drivers, which seems to result in some difficult to debug failure modes. See https://github.com/NixOS/nixpkgs/issues/181790#issuecomment-1188840862 for a description of this problem. Removing this flag entirely seems reasonable to me, and it results in k3s working again on my machine.
Diffstat (limited to 'nixos/modules/services/cluster')
| -rw-r--r-- | nixos/modules/services/cluster/k3s/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 421aa0aac60..bc5e8c66e2a 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -111,7 +111,6 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] - ++ (optional (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}") |