From c5b57b0479baa93dba6204c4eb48dbb694c7d4e1 Mon Sep 17 00:00:00 2001 From: dlorenc Date: Mon, 1 May 2017 13:21:19 -0700 Subject: [PATCH] Manual changes for 1.7 update. --- cmd/localkube/cmd/start.go | 6 ------ pkg/localkube/apiserver.go | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmd/localkube/cmd/start.go b/cmd/localkube/cmd/start.go index 8429f1d189..003607a8d2 100644 --- a/cmd/localkube/cmd/start.go +++ b/cmd/localkube/cmd/start.go @@ -21,7 +21,6 @@ import ( "os" "os/signal" - "github.com/coreos/pkg/capnslog" "github.com/golang/glog" "k8s.io/apiserver/pkg/util/feature" @@ -47,11 +46,6 @@ func StartLocalkube() { os.Exit(0) } - // Get the etcd logger for the api repo - apiRepoLogger := capnslog.MustRepoLogger("github.com/coreos/etcd/etcdserver/api") - // Set the logging level to NOTICE as there is an INFO lvl log statement that runs every few seconds -> log spam - apiRepoLogger.SetRepoLogLevel(capnslog.NOTICE) - // TODO: Require root SetupServer(Server) diff --git a/pkg/localkube/apiserver.go b/pkg/localkube/apiserver.go index 9e7c519fc6..307fd3fc85 100644 --- a/pkg/localkube/apiserver.go +++ b/pkg/localkube/apiserver.go @@ -36,8 +36,8 @@ func (lk LocalkubeServer) NewAPIServer() Server { func StartAPIServer(lk LocalkubeServer) func() error { config := options.NewServerRunOptions() - config.SecureServing.ServingOptions.BindAddress = lk.APIServerAddress - config.SecureServing.ServingOptions.BindPort = lk.APIServerPort + config.SecureServing.BindAddress = lk.APIServerAddress + config.SecureServing.BindPort = lk.APIServerPort config.InsecureServing.BindAddress = lk.APIServerInsecureAddress config.InsecureServing.BindPort = lk.APIServerInsecurePort @@ -73,7 +73,8 @@ func StartAPIServer(lk LocalkubeServer) func() error { lk.SetExtraConfigForComponent("apiserver", &config) return func() error { - return apiserver.Run(config) + stop := make(chan struct{}) + return apiserver.Run(config, stop) } }