validate the apiserver options (#1116)

per kubernetes/kubernetes#50308 (comment)

Author: MHBauer

cmd/apiserver/app/server/options.go

@@ -19,8 +19,10 @@ package server
 import (
 	"os"
 
+	"github.com/golang/glog"
 	"github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
 	"github.com/spf13/pflag"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	genericserveroptions "k8s.io/apiserver/pkg/server/options"
 )
 
@@ -52,6 +54,21 @@ type ServiceCatalogServerOptions struct {
 	StandaloneMode bool
 }
 
+// NewServiceCatalogServerOptions creates a new instances of
+// ServiceCatalogServerOptions with all sub-options filled in.
+func NewServiceCatalogServerOptions() *ServiceCatalogServerOptions {
+	return &ServiceCatalogServerOptions{
+		GenericServerRunOptions: genericserveroptions.NewServerRunOptions(),
+		AdmissionOptions:        genericserveroptions.NewAdmissionOptions(),
+		SecureServingOptions:    genericserveroptions.NewSecureServingOptions(),
+		AuthenticationOptions:   genericserveroptions.NewDelegatingAuthenticationOptions(),
+		AuthorizationOptions:    genericserveroptions.NewDelegatingAuthorizationOptions(),
+		AuditOptions:            genericserveroptions.NewAuditOptions(),
+		EtcdOptions:             NewEtcdOptions(),
+		TPROptions:              NewTPROptions(),
+	}
+}
+
 func (s *ServiceCatalogServerOptions) addFlags(flags *pflag.FlagSet) {
 	flags.StringVar(
 		&s.StorageTypeString,
@@ -83,6 +100,32 @@ func (s *ServiceCatalogServerOptions) StorageType() (server.StorageType, error)
 	return server.StorageTypeFromString(s.StorageTypeString)
 }
 
+// Validate checks all subOptions flags have been set and that they
+// have not been set in a conflictory manner.
+func (s *ServiceCatalogServerOptions) Validate() error {
+	errors := []error{}
+	// TODO uncomment after 1.8 rebase expecting
+	// https://github.com/kubernetes/kubernetes/pull/50308/files
+	// errors = append(errors, s.AdmissionOptions.Validate()...)
+	errors = append(errors, s.SecureServingOptions.Validate()...)
+	errors = append(errors, s.AuthenticationOptions.Validate()...)
+	errors = append(errors, s.AuthorizationOptions.Validate()...)
+	// etcd options
+	if "etcd" == s.StorageTypeString {
+		etcdErrs := s.EtcdOptions.Validate()
+		if len(etcdErrs) > 0 {
+			glog.Errorln("Error validating etcd options, do you have `--etcd-servers localhost` set?")
+		}
+		errors = append(errors, etcdErrs...)
+	}
+	// TODO add alternative storage validation
+	// errors = append(errors, s.TPROptions.Validate()...)
+	// TODO uncomment after 1.8 rebase expecting
+	// https://github.com/kubernetes/kubernetes/pull/47043
+	// errors = append(errors, s.AuditOptions.Validate()...)
+	return utilerrors.NewAggregate(errors)
+}
+
 // standaloneMode returns true if the env var SERVICE_CATALOG_STANALONE=true
 // If enabled, we will assume no integration with Kubernetes API server is performed.
 // It is intended for testing purposes only.

cmd/apiserver/app/server/run_server.go

@@ -43,6 +43,12 @@ func RunServer(opts *ServiceCatalogServerOptions) error {
 		if there is a need to stop the API server */
 		opts.StopCh = make(chan struct{})
 	}
+
+	err = opts.Validate()
+	if nil != err {
+		return err
+	}
+
 	if storageType == server.StorageTypeTPR {
 		return runTPRServer(opts)
 	}
@@ -102,12 +108,6 @@ func runEtcdServer(opts *ServiceCatalogServerOptions) error {
 		return err
 	}
 
-	// etcd options
-	if errs := etcdOpts.Validate(); len(errs) > 0 {
-		glog.Errorln("Error validating etcd options, do you have `--etcd-servers localhost` set?")
-		return errs[0]
-	}
-
 	glog.V(4).Infoln("Creating storage factory")
 
 	// The API server stores objects using a particular API version for each

cmd/apiserver/app/server/run_server_test.go

@@ -29,7 +29,7 @@ import (
 
 // make sure RunServer returns with an error when TPR fails to install
 func TestRunServerInstallTPRFails(t *testing.T) {
-	options := &ServiceCatalogServerOptions{}
+	options := NewServiceCatalogServerOptions()
 
 	fakeClientset := &kubeclientfake.Clientset{}
 	fakeClientset.AddReactor("get", "thirdpartyresources", func(core.Action) (bool, runtime.Object, error) {