Skip to content

Commit ee3d496

Browse files
vakwetuopenshift-merge-bot[bot]
authored andcommitted
Use full CA cert bundle instead of internal bundle
Change getNovaClient() to use tls.CABundleKey (full/public bundle) instead of tls.InternalCABundleKey. This ensures the operator can connect to external Keystone APIs that may use certificates not in the internal bundle. This will not affect existing workflows because all the certs in the internal bundle are always added to the full/public bundle as well. Jira: https://issues.redhat.com/browse/OSPRH-18652
1 parent 964875f commit ee3d496

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

internal/controller/common.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,15 +656,14 @@ func getNovaClient(
656656
var tlsConfig *openstack.TLSConfig
657657

658658
if parsedAuthURL.Scheme == "https" {
659-
660659
caCert, ctrlResult, err := secret.GetDataFromSecret(
661660
ctx,
662661
h,
663662
auth.GetCABundleSecretName(),
664663
// requeue is translated to error below as the secret already
665664
// verified to exists and has the expected fields.
666665
time.Second,
667-
tls.InternalCABundleKey)
666+
tls.CABundleKey)
668667
if err != nil {
669668
return nil, err
670669
}

0 commit comments

Comments
 (0)