IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

K8s: omit CABundle until insecure is false (#84323)

Browse Source
This commit is contained in:
Charandas
2024-03-12 12:58:02 -07:00
committed by GitHub
parent cfc3957894
commit 0eee72824c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/services/apiserver/aggregator/aggregator.go
View File

@@ -136,7 +136,7 @@ func CreateAggregatorConfig(commandOptions *options.Options, sharedConfig generi
return NewConfig(aggregatorConfig, sharedInformerFactory, nil), nil return NewConfig(aggregatorConfig, sharedInformerFactory, nil), nil
} }
caBundlePEM, err := readCABundlePEM(commandOptions.AggregatorOptions.APIServiceCABundleFile, commandOptions.ExtraOptions.DevMode) _, err = readCABundlePEM(commandOptions.AggregatorOptions.APIServiceCABundleFile, commandOptions.ExtraOptions.DevMode)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -151,9 +151,10 @@ func CreateAggregatorConfig(commandOptions *options.Options, sharedConfig generi
// https://github.com/kubernetes/kubernetes/pull/123808 // https://github.com/kubernetes/kubernetes/pull/123808
InsecureSkipTLSVerify: true, InsecureSkipTLSVerify: true,
ExternalNamesNamespace: externalNamesNamespace, ExternalNamesNamespace: externalNamesNamespace,
CABundle: caBundlePEM, // TODO: CABundle can't be set when insecure is true
Services: remoteServices, // CABundle: caBundlePEM,
serviceClientSet: serviceClient, Services: remoteServices,
serviceClientSet: serviceClient,
} }
return NewConfig(aggregatorConfig, sharedInformerFactory, remoteServicesConfig), nil return NewConfig(aggregatorConfig, sharedInformerFactory, remoteServicesConfig), nil