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

Make GenericApiServer.Run interruptable and fail on first listen

This commit is contained in:
Dr. Stefan Schimanski 2016-10-21 13:22:43 +02:00
parent 1e6f19829b
commit 31058e0bc9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/apiserver.go
View File

@ -60,7 +60,7 @@ func NewServerRunOptions() *genericoptions.ServerRunOptions {
return serverOptions return serverOptions
} }
func Run(serverOptions *genericoptions.ServerRunOptions) error { func Run(serverOptions *genericoptions.ServerRunOptions, stopCh <-chan struct{}) error {
// Set ServiceClusterIPRange // Set ServiceClusterIPRange
_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24") _, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
serverOptions.ServiceClusterIPRange = *serviceClusterIPRange serverOptions.ServiceClusterIPRange = *serviceClusterIPRange
@ -105,6 +105,6 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
if err := s.InstallAPIGroup(&apiGroupInfo); err != nil { if err := s.InstallAPIGroup(&apiGroupInfo); err != nil {
return fmt.Errorf("Error in installing API: %v", err) return fmt.Errorf("Error in installing API: %v", err)
} }
s.PrepareRun().Run() s.PrepareRun().Run(stopCh)
return nil return nil
} }

3
apiserver/server/main.go
View File

@ -19,6 +19,7 @@ package main
import ( import (
"k8s.io/kubernetes/examples/apiserver" "k8s.io/kubernetes/examples/apiserver"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/wait"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@ -32,7 +33,7 @@ func main() {
serverRunOptions.AddEtcdStorageFlags(pflag.CommandLine) serverRunOptions.AddEtcdStorageFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
if err := apiserver.Run(serverRunOptions); err != nil { if err := apiserver.Run(serverRunOptions, wait.NeverStop); err != nil {
glog.Fatalf("Error in bringing up the server: %v", err) glog.Fatalf("Error in bringing up the server: %v", err)
} }
} }