github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

React to go-systemd changes

Browse Source
This commit is contained in:
Andy Goldstein 2017-02-10 15:06:49 -05:00
parent a6b06bcf5c
commit 085db20a02
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View File

@ -230,8 +230,7 @@ func (s preparedGenericAPIServer) NonBlockingRun(stopCh <-chan struct{}) error {
s.RunPostStartHooks() s.RunPostStartHooks()
// err == systemd.SdNotifyNoSocket when not running on a systemd system if _, err := systemd.SdNotify(true, "READY=1\n"); err != nil {
if err := systemd.SdNotify("READY=1\n"); err != nil && err != systemd.SdNotifyNoSocket {
glog.Errorf("Unable to send systemd daemon successful start message: %v\n", err) glog.Errorf("Unable to send systemd daemon successful start message: %v\n", err)
} }

9
vendor/BUILD vendored
View File

@ -2142,7 +2142,10 @@ go_library(
go_library( go_library(
name = "github.com/coreos/go-systemd/daemon", name = "github.com/coreos/go-systemd/daemon",
srcs = ["github.com/coreos/go-systemd/daemon/sdnotify.go"], srcs = [
"github.com/coreos/go-systemd/daemon/sdnotify.go",
"github.com/coreos/go-systemd/daemon/watchdog.go",
],
tags = ["automanaged"], tags = ["automanaged"],
) )
@ -2179,7 +2182,7 @@ go_library(
cgo_genrule( cgo_genrule(
name = "github.com/coreos/go-systemd/util_cgo", name = "github.com/coreos/go-systemd/util_cgo",
srcs = ["github.com/coreos/go-systemd/util/util.go"], srcs = ["github.com/coreos/go-systemd/util/util_cgo.go"],
clinkopts = [ clinkopts = [
"-lz", "-lz",
"-lm", "-lm",
@ -2191,7 +2194,7 @@ cgo_genrule(
go_library( go_library(
name = "github.com/coreos/go-systemd/util", name = "github.com/coreos/go-systemd/util",
srcs = [], srcs = ["github.com/coreos/go-systemd/util/util.go"],
library = ":github.com/coreos/go-systemd/util_cgo", library = ":github.com/coreos/go-systemd/util_cgo",
tags = ["automanaged"], tags = ["automanaged"],
deps = ["//vendor:github.com/coreos/pkg/dlopen"], deps = ["//vendor:github.com/coreos/pkg/dlopen"],