Skip to content

fix(containerd): update k3s systemd unit restart to support agent mode #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vdice wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(containerd): update k3s systemd unit restart to support agent mode #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions internal/containerd/restart_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package containerd

import (
"bytes"
"context"
"fmt"
"log/slog"
Expand Down Expand Up @@ -89,11 +90,25 @@ func (c K3sRestarter) Restart() error {
// This restarter will be used both for stock K3s distros, which use systemd as well as K3d, which does not.

// If listing systemd units succeeds, prefer systemctl restart; otherwise kill pid
if _, err := ListSystemdUnits(); err == nil {
out, err := nsenterCmd("systemctl", "restart", "k3s").CombinedOutput()
// First, collect systemd units to determine which k3s service to restart
// TODO: It appears the service name itself can be customized, so we may want to consider similar support
// See https://github.com/k3s-io/k3s/blob/main/install.sh
Copy link
Contributor

@kate-goldenring kate-goldenring Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you create a follow up issue for this?

if units, err := ListSystemdUnits(); err == nil {
var service string
// Prioritize k3s-agent (more common); otherwise k3s
switch {
case bytes.Contains(units, []byte("k3s-agent.service")):
service = "k3s-agent"
case bytes.Contains(units, []byte("k3s.service")):
service = "k3s"
default:
return fmt.Errorf("failed to find a registered k3s systemd service")
}

out, err := nsenterCmd("systemctl", "restart", service).CombinedOutput()
slog.Debug(string(out))
if err != nil {
return fmt.Errorf("unable to restart k3s: %w", err)
return fmt.Errorf("unable to restart the %s systemd service: %w", service, err)
}
} else {
// TODO: this approach still leads to the behavior mentioned in https://github.com/spinframework/runtime-class-manager/issues/140:
Expand Down
Loading