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

Merge pull request #23953 from nikhiljindal/u8sServer

Browse Source 
Automatic merge from submit-queue

moving genericapiserver command line flags to genericapiserver

cc @kubernetes/sig-api-machinery
This commit is contained in:
k8s-merge-robot
2016-04-13 23:15:24 -07:00
parent a12cec52e5 8d7a8c6ae6
commit 429228d403
5 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/apiserver/apiserver.go
View File

@@ -55,7 +55,14 @@ func newStorageDestinations(groupName string, groupMeta *apimachinery.GroupMeta)
return &storageDestinations, nil
}
func Run() error {
func NewServerRunOptions() *genericapiserver.ServerRunOptions {
serverOptions := genericapiserver.NewServerRunOptions()
serverOptions.InsecurePort = InsecurePort
serverOptions.SecurePort = SecurePort
return serverOptions
}
func Run(serverOptions *genericapiserver.ServerRunOptions) error {
config := genericapiserver.Config{
EnableIndex: true,
EnableSwaggerSupport: true,
@@ -93,9 +100,6 @@ func Run() error {
if err := s.InstallAPIGroups([]genericapiserver.APIGroupInfo{apiGroupInfo}); err != nil {
return fmt.Errorf("Error in installing API: %v", err)
}
serverOptions := genericapiserver.NewServerRunOptions()
serverOptions.InsecurePort = InsecurePort
serverOptions.SecurePort = SecurePort
s.Run(serverOptions)
return nil
}