Some cleanup (#446)

Author: tamalsaha

server/options.go

@@ -14,7 +14,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-type ControllerOptions struct {
+type ExtraOptions struct {
 	EnableRBAC     bool
 	StashImageTag  string
 	DockerRegistry string
@@ -27,8 +27,8 @@ type ControllerOptions struct {
 	ResyncPeriod   time.Duration
 }
 
-func NewControllerOptions() *ControllerOptions {
-	return &ControllerOptions{
+func NewExtraOptions() *ExtraOptions {
+	return &ExtraOptions{
 		DockerRegistry: docker.ACRegistry,
 		StashImageTag:  stringz.Val(v.Version.Version, "canary"),
 		MaxNumRequeues: 5,
@@ -41,7 +41,7 @@ func NewControllerOptions() *ControllerOptions {
 	}
 }
 
-func (s *ControllerOptions) AddGoFlags(fs *flag.FlagSet) {
+func (s *ExtraOptions) AddGoFlags(fs *flag.FlagSet) {
 	fs.StringVar(&s.OpsAddress, "ops-address", s.OpsAddress, "Address to listen on for web interface and telemetry.")
 	fs.BoolVar(&s.EnableRBAC, "rbac", s.EnableRBAC, "Enable RBAC for operator")
 	fs.StringVar(&s.ScratchDir, "scratch-dir", s.ScratchDir, "Directory used to store temporary files. Use an `emptyDir` in Kubernetes.")
@@ -53,13 +53,13 @@ func (s *ControllerOptions) AddGoFlags(fs *flag.FlagSet) {
 	fs.DurationVar(&s.ResyncPeriod, "resync-period", s.ResyncPeriod, "If non-zero, will re-list this often. Otherwise, re-list will be delayed aslong as possible (until the upstream source closes the watch or times out.")
 }
 
-func (s *ControllerOptions) AddFlags(fs *pflag.FlagSet) {
+func (s *ExtraOptions) AddFlags(fs *pflag.FlagSet) {
 	pfs := flag.NewFlagSet("stash", flag.ExitOnError)
 	s.AddGoFlags(pfs)
 	fs.AddGoFlagSet(pfs)
 }
 
-func (s *ControllerOptions) ApplyTo(cfg *controller.ControllerConfig) error {
+func (s *ExtraOptions) ApplyTo(cfg *controller.Config) error {
 	var err error
 
 	cfg.EnableRBAC = s.EnableRBAC

server/start.go

@@ -18,7 +18,7 @@ const defaultEtcdPathPrefix = "/registry/stash.appscode.com"
 
 type StashOptions struct {
 	RecommendedOptions *genericoptions.RecommendedOptions
-	ControllerOptions  *ControllerOptions
+	ExtraOptions       *ExtraOptions
 
 	StdOut io.Writer
 	StdErr io.Writer
@@ -28,7 +28,7 @@ func NewStashOptions(out, errOut io.Writer) *StashOptions {
 	o := &StashOptions{
 		// TODO we will nil out the etcd storage options.  This requires a later level of k8s.io/apiserver
 		RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, server.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion)),
-		ControllerOptions:  NewControllerOptions(),
+		ExtraOptions:       NewExtraOptions(),
 		StdOut:             out,
 		StdErr:             errOut,
 	}
@@ -39,7 +39,7 @@ func NewStashOptions(out, errOut io.Writer) *StashOptions {
 
 func (o StashOptions) AddFlags(fs *pflag.FlagSet) {
 	o.RecommendedOptions.AddFlags(fs)
-	o.ControllerOptions.AddFlags(fs)
+	o.ExtraOptions.AddFlags(fs)
 }
 
 func (o StashOptions) Validate(args []string) error {
@@ -75,14 +75,14 @@ func (o StashOptions) Config() (*server.StashConfig, error) {
 		"/apis/admission.stash.appscode.com/v1alpha1/replicasets",
 	}
 
-	controllerConfig := controller.NewControllerConfig(serverConfig.ClientConfig)
-	if err := o.ControllerOptions.ApplyTo(controllerConfig); err != nil {
+	extraConfig := controller.NewConfig(serverConfig.ClientConfig)
+	if err := o.ExtraOptions.ApplyTo(extraConfig); err != nil {
 		return nil, err
 	}
 
 	config := &server.StashConfig{
-		GenericConfig:    serverConfig,
-		ControllerConfig: controllerConfig,
+		GenericConfig: serverConfig,
+		ExtraConfig:   extraConfig,
 	}
 	return config, nil
 }