Merge pull request #148 from ibuildthecloud/revert

Revert "Enable systemd ready notification for k3s server"
k3s-io · Mar 4, 2019 · 6de915d · 6de915d
2 parents 49d0f20 + 0414f97
commit 6de915d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -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

diff --git a/install.sh b/install.sh
@@ -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

diff --git a/k3s.service b/k3s.service
@@ -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

diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
@@ -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()