Skip to content

Commit 7bda5c0

Browse files
lmicciniclaude
andcommitted
Inline HasTransportConsumerFinalizer into TransportURL controller
Move the transport consumer finalizer check from the exported API helper into a private function in the controller — the only consumer. Delete transporturl_helpers.go entirely since all exported helpers are now either in lib-common (ManageSecretConsumerFinalizer, RemoveSecretConsumerFinalizer) or inlined here. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 080325f commit 7bda5c0

2 files changed

Lines changed: 12 additions & 42 deletions

File tree

apis/rabbitmq/v1beta1/transporturl_helpers.go

Lines changed: 0 additions & 40 deletions
This file was deleted.

internal/controller/rabbitmq/transporturl_controller.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ func (r *TransportURLReconciler) reconcileNormal(ctx context.Context, instance *
629629
if err != nil && !k8s_errors.IsNotFound(err) {
630630
return ctrl.Result{}, err
631631
}
632-
if err == nil && rabbitmqv1.HasTransportConsumerFinalizer(oldSecret) {
632+
if err == nil && hasTransportConsumerFinalizer(oldSecret) {
633633
Log.Info("Waiting for consumer to release previous transport secret",
634634
"secret", instance.Status.PreviousSecretName)
635635
return ctrl.Result{RequeueAfter: PendingReleaseCheckInterval}, nil
@@ -1058,7 +1058,7 @@ func (r *TransportURLReconciler) tryReleasePendingUser(ctx context.Context, inst
10581058
if err != nil && !k8s_errors.IsNotFound(err) {
10591059
return false, err
10601060
}
1061-
if err == nil && rabbitmqv1.HasTransportConsumerFinalizer(oldSecret) {
1061+
if err == nil && hasTransportConsumerFinalizer(oldSecret) {
10621062
Log.Info("Waiting for consumer to release old transport secret",
10631063
"secret", instance.Status.PreviousSecretName,
10641064
"pendingUser", pendingRef)
@@ -1309,6 +1309,16 @@ func (r *TransportURLReconciler) deleteLegacyOwnedResources(ctx context.Context,
13091309
return nil
13101310
}
13111311

1312+
func hasTransportConsumerFinalizer(secret *corev1.Secret) bool {
1313+
for _, f := range secret.Finalizers {
1314+
if strings.HasSuffix(f, rabbitmqv1.TransportSecretConsumerSuffix) &&
1315+
strings.HasPrefix(f, "openstack.org/") {
1316+
return true
1317+
}
1318+
}
1319+
return false
1320+
}
1321+
13121322
// GetRabbitmqCluster - get RabbitMq object in namespace
13131323
func getRabbitmqCluster(
13141324
ctx context.Context,

0 commit comments

Comments
 (0)