github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

genericapiserver: move MasterCount and service options into master

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2016-12-06 12:22:49 +01:00
parent 1eb9176455
commit 7267299c3c
10 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/apiserver/apiserver.go
View File

@@ -80,12 +80,10 @@ func NewServerRunOptions() *ServerRunOptions {
}
func (serverOptions *ServerRunOptions) Run(stopCh <-chan struct{}) error {
// Set ServiceClusterIPRange
_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
serverOptions.GenericServerRunOptions.ServiceClusterIPRange = *serviceClusterIPRange
serverOptions.Etcd.StorageConfig.ServerList = []string{"http://127.0.0.1:2379"}
genericvalidation.ValidateRunOptions(serverOptions.GenericServerRunOptions)
// TODO(sttts): unify signature of DefaultAndValidateRunOptions with the others
genericapiserver.DefaultAndValidateRunOptions(serverOptions.GenericServerRunOptions)
if errs := serverOptions.Etcd.Validate(); len(errs) > 0 {
return utilerrors.NewAggregate(errs)
}