Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update agent to notify systemd

Browse Source
This commit is contained in:
Erik Wilson 2019-07-18 06:40:39 -07:00
parent bb44211f51
commit e1162c7cfa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cli/agent/agent.go
View File

@ -8,12 +8,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/rancher/wrangler/pkg/signals" systemd "github.com/coreos/go-systemd/daemon"
"github.com/rancher/k3s/pkg/agent" "github.com/rancher/k3s/pkg/agent"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/datadir" "github.com/rancher/k3s/pkg/datadir"
"github.com/rancher/k3s/pkg/netutil" "github.com/rancher/k3s/pkg/netutil"
"github.com/rancher/wrangler/pkg/signals"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -74,6 +74,7 @@ func Run(ctx *cli.Context) error {
cfg.Labels = append(cfg.Labels, "node-role.kubernetes.io/worker=true") cfg.Labels = append(cfg.Labels, "node-role.kubernetes.io/worker=true")
contextCtx := signals.SetupSignalHandler(context.Background()) contextCtx := signals.SetupSignalHandler(context.Background())
systemd.SdNotify(true, "READY=1\n")
return agent.Run(contextCtx, cfg) return agent.Run(contextCtx, cfg)
} }

2
pkg/cli/server/server.go
View File

@ -194,7 +194,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
logrus.Info("k3s is up and running") logrus.Info("k3s is up and running")
if notifySocket != "" { if notifySocket != "" {
os.Setenv("NOTIFY_SOCKET", notifySocket) os.Setenv("NOTIFY_SOCKET", notifySocket)
systemd.SdNotify(true, "READY=1") systemd.SdNotify(true, "READY=1\n")
} }
if cfg.DisableAgent { if cfg.DisableAgent {