admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix config nil error

Browse Source
This commit is contained in:
Jeff
2019-09-23 14:00:56 +08:00
committed by zryfish
parent 3dca9feb0f
commit 468f7eddca
18 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/ks-apiserver/app/server.go
View File

@@ -162,7 +162,6 @@ func CreateClientSet(conf *apiserverconfig.Config, stopCh <-chan struct{}) error
SetS3Options(conf.S3Options).
SetOpenPitrixOptions(conf.OpenPitrixOptions).
SetPrometheusOptions(conf.MonitoringOptions).
SetRedisOptions(conf.RedisOptions).
SetKubeSphereOptions(conf.KubeSphereOptions).
SetElasticSearchOptions(conf.LoggingOptions)
@@ -276,8 +275,6 @@ func Complete(s *options.ServerRunOptions) error {
KubernetesOptions: s.KubernetesOptions,
ServiceMeshOptions: s.ServiceMeshOptions,
MonitoringOptions: s.MonitoringOptions,
LdapOptions: s.LdapOptions,
RedisOptions: s.RedisOptions,
S3Options: s.S3Options,
OpenPitrixOptions: s.OpenPitrixOptions,
LoggingOptions: s.LoggingOptions,
@@ -291,8 +288,6 @@ func Complete(s *options.ServerRunOptions) error {
ServiceMeshOptions: conf.ServiceMeshOptions,
MySQLOptions: conf.MySQLOptions,
MonitoringOptions: conf.MonitoringOptions,
LdapOptions: conf.LdapOptions,
RedisOptions: conf.RedisOptions,
S3Options: conf.S3Options,
OpenPitrixOptions: conf.OpenPitrixOptions,
LoggingOptions: conf.LoggingOptions,