split genericapiserver configuration apart so that you can run without flag options

This commit is contained in:
deads2k 2016-10-11 14:09:34 -04:00
parent 1995d0aa00
commit 00faff90bc
1 changed files with 7 additions and 2 deletions

View File

@ -67,10 +67,15 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
serverOptions.StorageConfig.ServerList = []string{"http://127.0.0.1:2379"} serverOptions.StorageConfig.ServerList = []string{"http://127.0.0.1:2379"}
genericvalidation.ValidateRunOptions(serverOptions) genericvalidation.ValidateRunOptions(serverOptions)
genericvalidation.VerifyEtcdServersList(serverOptions) genericvalidation.VerifyEtcdServersList(serverOptions)
config := genericapiserver.NewConfig(serverOptions) config := genericapiserver.NewConfig().ApplyOptions(serverOptions).Complete()
if err := config.MaybeGenerateServingCerts(); err != nil {
// this wasn't treated as fatal for this process before
fmt.Printf("Error creating cert: %v", err)
}
config.Authorizer = authorizer.NewAlwaysAllowAuthorizer() config.Authorizer = authorizer.NewAlwaysAllowAuthorizer()
config.Serializer = api.Codecs config.Serializer = api.Codecs
s, err := config.Complete().New() s, err := config.New()
if err != nil { if err != nil {
return fmt.Errorf("Error in bringing up the server: %v", err) return fmt.Errorf("Error in bringing up the server: %v", err)
} }