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

Revert "Enable systemd ready notification for k3s server"

Browse Source 
This reverts commit c73e9187bb.
This commit is contained in:
Darren Shepherd 2019-03-04 13:18:20 -07:00
parent 49d0f20e5b
commit 0414f97c78
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -205,7 +205,6 @@ Documentation=https://k3s.io
After=network.target
[Service]
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server

1
install.sh
View File

@ -139,7 +139,6 @@ Documentation=https://k3s.io
After=network.target
[Service]
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server

1
k3s.service
View File

@ -4,7 +4,6 @@ Documentation=https://k3s.io
After=network.target
[Service]
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server

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

@ -9,7 +9,6 @@ import (
"path/filepath"
"strings"
systemd "github.com/coreos/go-systemd/daemon"
"github.com/docker/docker/pkg/reexec"
"github.com/natefinch/lumberjack"
"github.com/pkg/errors"
@ -20,7 +19,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"k8s.io/apimachinery/pkg/util/net"
genericapiserver "k8s.io/apiserver/pkg/server"
_ "github.com/mattn/go-sqlite3" // ensure we have sqlite
)
@ -53,7 +51,6 @@ func runWithLogging(app *cli.Context, cfg *cmds.Server) error {
}
func Run(app *cli.Context) error {
genericapiserver.NotifySystemD = false
return run(app, &cmds.ServerConfig)
}
@ -109,7 +106,6 @@ func run(app *cli.Context, cfg *cmds.Server) error {
}
logrus.Info("k3s is up and running")
go systemd.SdNotify(false, "READY=1")
if cfg.DisableAgent {
<-ctx.Done()