diff options
| author | ThinkChaos <ThinkChaos@users.noreply.github.com> | 2020-11-09 19:50:36 +0100 |
|---|---|---|
| committer | ThinkChaos <ThinkChaos@users.noreply.github.com> | 2020-11-09 19:50:36 +0100 |
| commit | 7514f00733cbdb8f61bec5e189d449c61c801de8 (patch) | |
| tree | 962ccc626aff8df04750a3c82267762639869898 /nixos | |
| parent | 9ed8e03a09a127e4dfdbd00524ede239b94cac78 (diff) | |
| download | nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.tar nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.tar.gz nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.tar.bz2 nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.tar.lz nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.tar.xz nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.tar.zst nixpkgs-7514f00733cbdb8f61bec5e189d449c61c801de8.zip | |
nixos/k3s: Update service to match upstream
Fixes race between k3s and network.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/cluster/k3s/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 2e8bf20a68f..fe9f43f6426 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -78,7 +78,8 @@ in systemd.services.k3s = { description = "k3s service"; - after = mkIf cfg.docker [ "docker.service" ]; + after = if cfg.docker then "docker.service" else "network-online.service"; + wants = "network-online.service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 @@ -87,6 +88,10 @@ in Delegate = "yes"; Restart = "always"; RestartSec = "5s"; + LimitNOFILE = 1048576; + LimitNPROC = "infinity"; + LimitCORE = "infinity"; + TasksMax = "infinity"; ExecStart = concatStringsSep " \\\n " ( [ "${cfg.package}/bin/k3s ${cfg.role}" |