From 688fe23090e9d160aec54083020c2433e8611348 Mon Sep 17 00:00:00 2001 From: jianzzz Date: Thu, 26 Nov 2020 20:40:18 +0800 Subject: [PATCH] fix(application): enable to disable registry client (#944) Co-authored-by: jianzhuang --- cmd/tke-application-api/app/config/config.go | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/cmd/tke-application-api/app/config/config.go b/cmd/tke-application-api/app/config/config.go index b80841b00..6c268766e 100644 --- a/cmd/tke-application-api/app/config/config.go +++ b/cmd/tke-application-api/app/config/config.go @@ -130,26 +130,25 @@ func CreateConfigFromOptions(serverName string, opts *options.Options) (*Config, return nil, err } - // client config for registry apiserver - registryAPIServerClientConfig, ok, err := controllerconfig.BuildClientConfig(opts.RegistryAPIClient) - if err != nil { - return nil, err - } - if !ok || registryAPIServerClientConfig == nil { - return nil, fmt.Errorf("failed to initialize client config of registry API server") - } - registryClient, err := versionedclientset.NewForConfig(rest.AddUserAgent(registryAPIServerClientConfig, "tke-application-api")) - if err != nil { - return nil, err - } - cfg := &Config{ ServerName: serverName, GenericAPIServerConfig: genericAPIServerConfig, VersionedSharedInformerFactory: versionedInformers, StorageFactory: storageFactory, PlatformClient: platformClient.PlatformV1(), - RegistryClient: registryClient.RegistryV1(), + } + + // client config for registry apiserver + registryAPIServerClientConfig, ok, err := controllerconfig.BuildClientConfig(opts.RegistryAPIClient) + if err != nil { + return nil, err + } + if ok && registryAPIServerClientConfig != nil { + registryClient, err := versionedclientset.NewForConfig(rest.AddUserAgent(registryAPIServerClientConfig, "tke-application-api")) + if err != nil { + return nil, err + } + cfg.RegistryClient = registryClient.RegistryV1() } if err := (&opts.FeatureOptions.Repo).ApplyTo(&cfg.RepoConfiguration); err != nil {