The systemd unit for k3s should differ between agents and servers #85813
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ping @euank @offlinehacker @nlewo as you were all part of the original pull request a few days ago. Thanks! |
nlewo
reviewed
Apr 22, 2020
|
Good suggestion. Will make that change tomorrow.
Den ons 22 apr. 2020 23:29lewo <notifications@github.com> skrev:
… ***@***.**** commented on this pull request.
Thanks for this contribution!
I just added a minor comment but lgtm otherwise;)
------------------------------
In nixos/modules/services/cluster/k3s/default.nix
<#85813 (comment)>:
> @@ -81,8 +81,8 @@ in
after = mkIf cfg.docker [ "docker.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- # Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2
- Type = "notify";
+ # Extracted from the content served at https://get.k3s.io
⬇️ Suggested change
- # Extracted from the content served at https://get.k3s.io
+ # See https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#85813 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAAG5LFCNEXTAQNK7Y7RI5LRN5OVJANCNFSM4MOQMDJQ>
.
|
|
This LGTM. Thanks for cleaning that up! |
|
@GrahamcOfBorg test k3s |
|
The test locally succeeded. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The agent part of k3s doesn't notify systemd of startup and should therefore be of type "exec" rather than "notify". As far as I can tell the ansible template is wrong. When actually fetching the installation script via https://get.k3s.io you see that they use different systemd types for agents and servers.
Since I've had my own k3s module for a while I happen to know that this is indeed the case since agents won't start properly without this (but you won't notice in single node "clusters" ofc).
Further verification that this is the case here:
https://github.com/rancher/k3s/blob/553517e19433c6b3e58fd25e7ac83ed9b6d5fe1e/pkg/cli/server/server.go#L183 - server does notify systemd
The agent lacks this notification:
https://github.com/rancher/k3s/blob/master/pkg/cli/agent/agent.go
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)