kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Manual changes for 1.7 update.

pull/1693/head
dlorenc 2017-05-01 13:21:19 -07:00 committed by Matt Rickard
parent e550e3d0ea
commit c5b57b0479
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/localkube/cmd/start.go
View File

@ -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)

7
pkg/localkube/apiserver.go
View File

@ -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)
}
}