Skip to content

[release-4.19] OCPBUGS-55798: Sync OpenStack CA Bundles from legacy location #856

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

Closed
openshift-cherrypick-robot wants to merge 2 commits into from
Closed

[release-4.19] OCPBUGS-55798: Sync OpenStack CA Bundles from legacy location #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f693a
trivial: Use errors.New rather than fmt.Errorf
stephenfin Apr 17, 2025
852f4f6
openstack: Sync cacert from CCM to root credential
stephenfin Apr 17, 2025
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
24 changes: 21 additions & 3 deletions pkg/operator/secretannotator/openstack/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package openstack

import (
"context"
"errors"
"fmt"
"time"

Expand Down Expand Up @@ -134,7 +135,7 @@ func (r *ReconcileCloudCredSecret) Reconcile(ctx context.Context, request reconc
}
if conflict {
r.Logger.Error("configuration conflict between legacy configmap and operator config")
return reconcile.Result{}, fmt.Errorf("configuration conflict")
return reconcile.Result{}, errors.New("configuration conflict")
}
if mode == operatorv1.CloudCredentialsModeManual {
r.Logger.Info("operator in disabled / manual mode")
Expand All @@ -146,7 +147,7 @@ func (r *ReconcileCloudCredSecret) Reconcile(ctx context.Context, request reconc
default:
const msg = "OpenStack only supports Passthrough mode"
r.Logger.Error(msg)
return reconcile.Result{}, fmt.Errorf(msg)
return reconcile.Result{}, errors.New(msg)
}

secret := &corev1.Secret{}
Expand All @@ -162,13 +163,30 @@ func (r *ReconcileCloudCredSecret) Reconcile(ctx context.Context, request reconc
return reconcile.Result{}, err
}

// Sync the cacert from its legacy location (the 'ca-bundle.pem' key of the
// 'openshift-config / cloud-provider-config' CM) to the new place, if present.
// TODO(stephenfin): Remove this syncer in a future release once CCM no longer
// relies on the legacy place during bootstrapping.
config := &corev1.ConfigMap{}
err = r.RootCredClient.Get(context.Background(), types.NamespacedName{Namespace: "openshift-config", Name: "cloud-provider-config"}, config)
if err != nil {
r.Logger.Debugf("cloud provider config not found: %v", err)
return reconcile.Result{}, err
}

cacertUpdated := false
if ccmCACert := config.Data["ca-bundle.pem"]; ccmCACert != cacert {
cacert = ccmCACert
cacertUpdated = true
}

clouds, cloudsUpdated, err := r.fixInvalidCACertFile(clouds)
if err != nil {
r.Logger.WithError(err).Error("errored checking clouds.yaml")
return reconcile.Result{}, err
}

if cloudsUpdated {
if cloudsUpdated || cacertUpdated {
openstack.SetRootCloudCredentialsSecretData(secret, clouds, cacert)
err := r.RootCredClient.Update(context.TODO(), secret)
if err != nil {
Expand Down
12 changes: 10 additions & 2 deletions pkg/operator/secretannotator/openstack/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ func TestReconcileCloudCredSecret_Reconcile(t *testing.T) {
},
}

ccmConfig := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "cloud-provider-config",
Namespace: "openshift-config",
},
Data: map[string]string{},
}

/*
Test parsing of CCO configuration and the resulting annotation of the
root secret. Most of this is boilerplate behaviour.
Expand Down Expand Up @@ -181,7 +189,7 @@ func TestReconcileCloudCredSecret_Reconcile(t *testing.T) {
secret := testSecret(fmt.Sprintf(cloudsWithCACert, correctCACertFile))
existing := append(tc.existing, infra, testOperatorConfig(tc.mode))
fakeClient := fake.NewClientBuilder().WithRuntimeObjects(existing...).Build()
fakeRootCredClient := fake.NewClientBuilder().WithRuntimeObjects(secret).Build()
fakeRootCredClient := fake.NewClientBuilder().WithRuntimeObjects(secret, ccmConfig).Build()

r := &ReconcileCloudCredSecret{
Client: fakeClient,
Expand Down Expand Up @@ -270,7 +278,7 @@ func TestReconcileCloudCredSecret_Reconcile(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
secret := testSecret(tc.cloudsYAML)
fakeClient := fake.NewClientBuilder().WithRuntimeObjects(infra, passthrough).Build()
fakeRootCredClient := fake.NewClientBuilder().WithRuntimeObjects(secret).Build()
fakeRootCredClient := fake.NewClientBuilder().WithRuntimeObjects(secret, ccmConfig).Build()

t.Logf("clouds.yaml: %s", tc.cloudsYAML)
r := &ReconcileCloudCredSecret{
Expand Down