Skip to content

K
k3s
Commit 0414f97c authored by Darren Shepherd's avatar Darren Shepherd
Browse files
Options

Revert "Enable systemd ready notification for k3s server"

This reverts commit c73e9187.
parent 49d0f20e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
README.md
View file @ 0414f97c
...@@ -205,7 +205,6 @@ Documentation=https://k3s.io ...@@ -205,7 +205,6 @@ Documentation=https://k3s.io
After=network.target After=network.target
[Service] [Service]
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server ExecStart=/usr/local/bin/k3s server
......
install.sh
View file @ 0414f97c
...@@ -139,7 +139,6 @@ Documentation=https://k3s.io ...@@ -139,7 +139,6 @@ Documentation=https://k3s.io
After=network.target After=network.target
[Service] [Service]
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server ExecStart=/usr/local/bin/k3s server
......
k3s.service
View file @ 0414f97c
...@@ -4,7 +4,6 @@ Documentation=https://k3s.io ...@@ -4,7 +4,6 @@ Documentation=https://k3s.io
After=network.target After=network.target
[Service] [Service]
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server ExecStart=/usr/local/bin/k3s server
......
pkg/cli/server/server.go
View file @ 0414f97c
...@@ -9,7 +9,6 @@ import ( ...@@ -9,7 +9,6 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
systemd "github.com/coreos/go-systemd/daemon"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/natefinch/lumberjack" "github.com/natefinch/lumberjack"
"github.com/pkg/errors" "github.com/pkg/errors"
...@@ -20,7 +19,6 @@ import ( ...@@ -20,7 +19,6 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"
genericapiserver "k8s.io/apiserver/pkg/server"
_ "github.com/mattn/go-sqlite3" // ensure we have sqlite _ "github.com/mattn/go-sqlite3" // ensure we have sqlite
) )
...@@ -53,7 +51,6 @@ func runWithLogging(app *cli.Context, cfg *cmds.Server) error { ...@@ -53,7 +51,6 @@ func runWithLogging(app *cli.Context, cfg *cmds.Server) error {
} }
func Run(app *cli.Context) error { func Run(app *cli.Context) error {
genericapiserver.NotifySystemD = false
return run(app, &cmds.ServerConfig) return run(app, &cmds.ServerConfig)
} }
...@@ -109,7 +106,6 @@ func run(app *cli.Context, cfg *cmds.Server) error { ...@@ -109,7 +106,6 @@ func run(app *cli.Context, cfg *cmds.Server) error {
} }
logrus.Info("k3s is up and running") logrus.Info("k3s is up and running")
go systemd.SdNotify(false, "READY=1")
if cfg.DisableAgent { if cfg.DisableAgent {
<-ctx.Done() <-ctx.Done()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment