From 2e712473aa5635bf9cfc0374462389afb3ce8b36 Mon Sep 17 00:00:00 2001
From: nikhiljindal <nikhiljindal@google.com>
Date: Wed, 6 Apr 2016 15:24:48 -0700
Subject: [PATCH] moving genericapiserver command line flags to
 genericapiserver

---
 apiserver/apiserver.go      | 12 ++++++++----
 apiserver/apiserver_test.go |  2 +-
 apiserver/server/main.go    | 10 +++++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apiserver/apiserver.go b/apiserver/apiserver.go
index 7c1b2266..4e694900 100644
--- a/apiserver/apiserver.go
+++ b/apiserver/apiserver.go
@@ -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,
@@ -92,9 +99,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
 }
diff --git a/apiserver/apiserver_test.go b/apiserver/apiserver_test.go
index 5884ef09..e36b359c 100644
--- a/apiserver/apiserver_test.go
+++ b/apiserver/apiserver_test.go
@@ -41,7 +41,7 @@ var groupVersionForDiscovery = unversioned.GroupVersionForDiscovery{
 
 func TestRun(t *testing.T) {
 	go func() {
-		if err := Run(); err != nil {
+		if err := Run(NewServerRunOptions()); err != nil {
 			t.Fatalf("Error in bringing up the server: %v", err)
 		}
 	}()
diff --git a/apiserver/server/main.go b/apiserver/server/main.go
index aec0ef0e..d0bdeef1 100644
--- a/apiserver/server/main.go
+++ b/apiserver/server/main.go
@@ -18,12 +18,20 @@ package main
 
 import (
 	"k8s.io/kubernetes/examples/apiserver"
+	"k8s.io/kubernetes/pkg/util/flag"
 
 	"github.com/golang/glog"
+	"github.com/spf13/pflag"
 )
 
 func main() {
-	if err := apiserver.Run(); err != nil {
+	serverRunOptions := apiserver.NewServerRunOptions()
+
+	// Parse command line flags.
+	serverRunOptions.AddFlags(pflag.CommandLine)
+	flag.InitFlags()
+
+	if err := apiserver.Run(serverRunOptions); err != nil {
 		glog.Fatalf("Error in bringing up the server: %v", err)
 	}
 }