From 085db20a02b222e8a909da02fc5025aeee6ebc57 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Fri, 10 Feb 2017 15:06:49 -0500 Subject: [PATCH] React to go-systemd changes --- .../src/k8s.io/apiserver/pkg/server/genericapiserver.go | 3 +-- vendor/BUILD | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go index 331e3a447bd..1518f8c46b4 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go +++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go @@ -230,8 +230,7 @@ func (s preparedGenericAPIServer) NonBlockingRun(stopCh <-chan struct{}) error { s.RunPostStartHooks() - // err == systemd.SdNotifyNoSocket when not running on a systemd system - if err := systemd.SdNotify("READY=1\n"); err != nil && err != systemd.SdNotifyNoSocket { + if _, err := systemd.SdNotify(true, "READY=1\n"); err != nil { glog.Errorf("Unable to send systemd daemon successful start message: %v\n", err) } diff --git a/vendor/BUILD b/vendor/BUILD index 4dca07c9364..13d148903cf 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -2142,7 +2142,10 @@ go_library( go_library( 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"], ) @@ -2179,7 +2182,7 @@ go_library( cgo_genrule( 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 = [ "-lz", "-lm", @@ -2191,7 +2194,7 @@ cgo_genrule( go_library( 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", tags = ["automanaged"], deps = ["//vendor:github.com/coreos/pkg/dlopen"],