Skip to content

Use regexp on K3sRestarter.Restart() #705

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
Shunpoco wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −11
Open

Use regexp on K3sRestarter.Restart() #705

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
13 changes: 2 additions & 11 deletions internal/containerd/restart_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package containerd

import (
"bytes"
"context"
"fmt"
"log/slog"
Expand Down Expand Up @@ -92,16 +91,8 @@ func (c K3sRestarter) Restart() error {
// If listing systemd units succeeds, prefer systemctl restart; otherwise kill pid
// First, collect systemd units to determine which k3s service to restart
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")
}
// It matches with `k3s.service`, and `k3s-xxx.service`
service := regexp.MustCompile(`k3s(-.*|)\.service`).FindString(string(units))

out, err := nsenterCmd("systemctl", "restart", service).CombinedOutput()
slog.Debug(string(out))
Expand Down
Loading