From 9699f6c5664b53d4a4a8c691fb5515e02da8fcaa Mon Sep 17 00:00:00 2001 From: hongming Date: Sat, 30 May 2020 10:27:43 +0800 Subject: [PATCH] fix: crash if configfile not provide Signed-off-by: hongming --- cmd/ks-apiserver/app/options/options.go | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/cmd/ks-apiserver/app/options/options.go b/cmd/ks-apiserver/app/options/options.go index cce118bc0..89354f158 100644 --- a/cmd/ks-apiserver/app/options/options.go +++ b/cmd/ks-apiserver/app/options/options.go @@ -7,7 +7,6 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/apiserver" - authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" apiserverconfig "kubesphere.io/kubesphere/pkg/apiserver/config" "kubesphere.io/kubesphere/pkg/informers" genericoptions "kubesphere.io/kubesphere/pkg/server/options" @@ -18,12 +17,9 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/ldap" esclient "kubesphere.io/kubesphere/pkg/simple/client/logging/elasticsearch" "kubesphere.io/kubesphere/pkg/simple/client/monitoring/prometheus" - "kubesphere.io/kubesphere/pkg/simple/client/multicluster" - "kubesphere.io/kubesphere/pkg/simple/client/network" "kubesphere.io/kubesphere/pkg/simple/client/openpitrix" "kubesphere.io/kubesphere/pkg/simple/client/s3" fakes3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" - "kubesphere.io/kubesphere/pkg/simple/client/servicemesh" "kubesphere.io/kubesphere/pkg/simple/client/sonarqube" "net/http" "strings" @@ -41,22 +37,7 @@ type ServerRunOptions struct { func NewServerRunOptions() *ServerRunOptions { s := &ServerRunOptions{ GenericServerRunOptions: genericoptions.NewServerRunOptions(), - Config: &apiserverconfig.Config{ - KubernetesOptions: k8s.NewKubernetesOptions(), - DevopsOptions: jenkins.NewDevopsOptions(), - SonarQubeOptions: sonarqube.NewSonarQubeOptions(), - ServiceMeshOptions: servicemesh.NewServiceMeshOptions(), - NetworkOptions: network.NewNetworkOptions(), - MonitoringOptions: prometheus.NewPrometheusOptions(), - S3Options: s3.NewS3Options(), - OpenPitrixOptions: openpitrix.NewOptions(), - LoggingOptions: esclient.NewElasticSearchOptions(), - LdapOptions: ldap.NewOptions(), - RedisOptions: cache.NewRedisOptions(), - AuthenticationOptions: authoptions.NewAuthenticateOptions(), - MultiClusterOptions: multicluster.NewOptions(), - EventsOptions: eventsclient.NewElasticSearchOptions(), - }, + Config: apiserverconfig.New(), } return s