Skip to content

[18.0-fr3] Optimize getBundlePEM #1502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 26, 2025
Merged

[18.0-fr3] Optimize getBundlePEM #1502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions pkg/openstack/ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"math"
"os"
"strings"
"time"

certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
Expand Down Expand Up @@ -458,6 +459,15 @@ func ReconcileCAs(ctx context.Context, instance *corev1.OpenStackControlPlane, h
return ctrl.Result{}, err
}

caBundlePEM, err := bundle.getBundlePEM()
if err != nil {
return ctrl.Result{}, fmt.Errorf("failed to create CA bundle PEM: %w", err)
}
caOnlyBundlePEM, err := caOnlyBundle.getBundlePEM()
if err != nil {
return ctrl.Result{}, fmt.Errorf("failed to create CA only bundle PEM: %w", err)
}

saSecretTemplate := []util.Template{
{
Name: tls.CABundleSecret,
Expand All @@ -471,8 +481,8 @@ func ReconcileCAs(ctx context.Context, instance *corev1.OpenStackControlPlane, h
},
ConfigOptions: nil,
CustomData: map[string]string{
tls.CABundleKey: bundle.getBundlePEM(),
tls.InternalCABundleKey: caOnlyBundle.getBundlePEM(),
tls.CABundleKey: caBundlePEM,
tls.InternalCABundleKey: caOnlyBundlePEM,
},
SkipSetOwner: true, // TODO: (mschuppert) instead add e.g. keystoneapi to secret to prevent keystoneapi on cleanup to switch to not ready
},
Expand Down Expand Up @@ -796,16 +806,25 @@ func (cab *caBundle) getCertsFromPEM(PEMdata []byte) error {
return nil
}

// Create PEM bundle from certificates
func (cab *caBundle) getBundlePEM() string {
var bundleData string
func (cab *caBundle) getBundlePEM() (string, error) {
var b strings.Builder

for _, cert := range cab.certs {
bundleData += "# " + cert.cert.Issuer.CommonName + "\n" +
string(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: cert.cert.Raw}))
b.WriteString("# ")
b.WriteString(cert.cert.Issuer.CommonName)
b.WriteByte('\n')

block := &pem.Block{
Type: "CERTIFICATE",
Bytes: cert.cert.Raw,
}

if err := pem.Encode(&b, block); err != nil {
return "", fmt.Errorf("failed to encode bundle PEM for %w", err)
}
}

return bundleData
return b.String(), nil
}

func addIssuerLabelAnnotation(
Expand Down