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

Extract etcd options from genericapiserver.

This commit is contained in:
mksalawa 2016-08-09 13:35:53 +02:00
parent a5d7890b39
commit 2171935491
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apiserver/apiserver.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver"
genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
genericvalidation "k8s.io/kubernetes/pkg/genericapiserver/validation"
"k8s.io/kubernetes/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/storage/storagebackend"
// Install the testgroup API // Install the testgroup API
@ -51,7 +52,7 @@ func newStorageFactory() genericapiserver.StorageFactory {
} }
func NewServerRunOptions() *genericoptions.ServerRunOptions { func NewServerRunOptions() *genericoptions.ServerRunOptions {
serverOptions := genericoptions.NewServerRunOptions() serverOptions := genericoptions.NewServerRunOptions().WithEtcdOptions()
serverOptions.InsecurePort = InsecurePort serverOptions.InsecurePort = InsecurePort
return serverOptions return serverOptions
} }
@ -61,7 +62,8 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24") _, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
serverOptions.ServiceClusterIPRange = *serviceClusterIPRange serverOptions.ServiceClusterIPRange = *serviceClusterIPRange
serverOptions.StorageConfig.ServerList = []string{"http://127.0.0.1:4001"} serverOptions.StorageConfig.ServerList = []string{"http://127.0.0.1:4001"}
genericapiserver.ValidateRunOptions(serverOptions) genericvalidation.ValidateRunOptions(serverOptions)
genericvalidation.VerifyEtcdServersList(serverOptions)
config := genericapiserver.NewConfig(serverOptions) config := genericapiserver.NewConfig(serverOptions)
config.Serializer = api.Codecs config.Serializer = api.Codecs
s, err := genericapiserver.New(config) s, err := genericapiserver.New(config)

3
apiserver/server/main.go
View File

@ -28,7 +28,8 @@ func main() {
serverRunOptions := apiserver.NewServerRunOptions() serverRunOptions := apiserver.NewServerRunOptions()
// Parse command line flags. // Parse command line flags.
serverRunOptions.AddFlags(pflag.CommandLine) serverRunOptions.AddUniversalFlags(pflag.CommandLine)
serverRunOptions.AddEtcdStorageFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
if err := apiserver.Run(serverRunOptions); err != nil { if err := apiserver.Run(serverRunOptions); err != nil {