Fix server systemd detection

* Use INVOCATION_ID to detect execution under systemd, since as of a9b5a193 NOTIFY_SOCKET is now cleared by the server code. * Set the unit type to notify by default for both server and agent, which is what Rancher-managed installs have done for a while. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Fix server systemd detection
bd5fdfce · Brad Davidson · Brad Davidson · 1674b9d6 · bd5fdfce · bd5fdfce
Commit bd5fdfce authored Jul 12, 2022 by Brad Davidson Committed by Brad Davidson Jul 21, 2022
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

install.sh install.sh +0 -4

config_linux.go pkg/agent/containerd/config_linux.go +4 -1

No files found.
--- a/install.sh
+++ b/install.sh
@@ -217,11 +217,7 @@ setup_env() {
    if [ -n "${INSTALL_K3S_TYPE}" ]; then
        SYSTEMD_TYPE=${INSTALL_K3S_TYPE}
    else
-        if [ "${CMD_K3S}" = server ]; then
        SYSTEMD_TYPE=notify
-        else
-            SYSTEMD_TYPE=exec
-        fi
    fi
    # --- use binary install directory if defined or create default ---

--- a/pkg/agent/containerd/config_linux.go
+++ b/pkg/agent/containerd/config_linux.go
@@ -52,7 +52,10 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error {
 	if disableCgroup {
 		logrus.Warn("cgroup v2 controllers are not delegated for rootless. Disabling cgroup.")
 	} else {
-		cfg.AgentConfig.Systemd = controllers["cpuset"] && os.Getenv("NOTIFY_SOCKET") != ""
+		// note: this mutatation of the passed agent.Config is later used to set the
+		// kubelet's cgroup-driver flag. This may merit moving to somewhere else in order
+		// to avoid mutating the configuration while setting up containerd.
+		cfg.AgentConfig.Systemd = !isRunningInUserNS && controllers["cpuset"] && os.Getenv("INVOCATION_ID") != ""
 	}
 	var containerdTemplate string