Skip to content

Commit

Permalink
fix(application): enable to disable registry client (#944)
Browse files Browse the repository at this point in the history
Co-authored-by: jianzhuang <jianzhuang@tencent.com>
  • Loading branch information
jianzzz and jianzhuang committed Nov 26, 2020
1 parent 885050e commit 688fe23
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions cmd/tke-application-api/app/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 688fe23

Please sign in to comment.