Cleanup apiserver

Author: tamalsaha

apiserver.go

@@ -15,7 +15,7 @@ import (
 
 const defaultEtcdPathPrefix = "/registry/stash.appscode.com"
 
-type AdmissionServerOptions struct {
+type APIServerOptions struct {
 	RecommendedOptions *genericoptions.RecommendedOptions
 
 	AdmissionHooks []apiserver.AdmissionHook
@@ -24,8 +24,8 @@ type AdmissionServerOptions struct {
 	StdErr io.Writer
 }
 
-func NewAdmissionServerOptions(out, errOut io.Writer, admissionHooks ...apiserver.AdmissionHook) *AdmissionServerOptions {
-	o := &AdmissionServerOptions{
+func NewAPIServerOptions(out, errOut io.Writer, admissionHooks ...apiserver.AdmissionHook) *APIServerOptions {
+	o := &APIServerOptions{
 		// TODO we will nil out the etcd storage options.  This requires a later level of k8s.io/apiserver
 		RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, apiserver.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion)),
 
@@ -41,7 +41,7 @@ func NewAdmissionServerOptions(out, errOut io.Writer, admissionHooks ...apiserve
 
 // NewCommandStartMaster provides a CLI handler for 'start master' command
 func NewCommandStartAPIServer(out, errOut io.Writer, stopCh <-chan struct{}) *cobra.Command {
-	o := NewAdmissionServerOptions(out, errOut)
+	o := NewAPIServerOptions(out, errOut)
 
 	cmd := &cobra.Command{
 		Use:   "apiserver",
@@ -71,15 +71,15 @@ func NewCommandStartAPIServer(out, errOut io.Writer, stopCh <-chan struct{}) *co
 	return cmd
 }
 
-func (o AdmissionServerOptions) Validate(args []string) error {
+func (o APIServerOptions) Validate(args []string) error {
 	return nil
 }
 
-func (o *AdmissionServerOptions) Complete() error {
+func (o *APIServerOptions) Complete() error {
 	return nil
 }
 
-func (o AdmissionServerOptions) Config() (*apiserver.Config, error) {
+func (o APIServerOptions) Config() (*apiserver.Config, error) {
 	// TODO have a "real" external address
 	if err := o.RecommendedOptions.SecureServing.MaybeDefaultWithSelfSignedCerts("localhost", nil, []net.IP{net.ParseIP("127.0.0.1")}); err != nil {
 		return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
@@ -99,7 +99,7 @@ func (o AdmissionServerOptions) Config() (*apiserver.Config, error) {
 	return config, nil
 }
 
-func (o AdmissionServerOptions) RunServer(stopCh <-chan struct{}) error {
+func (o APIServerOptions) RunServer(stopCh <-chan struct{}) error {
 	config, err := o.Config()
 	if err != nil {
 		return err