Skip to content

Commit 98d388a

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 dfc8448 commit 98d388a

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
@@ -630,7 +630,7 @@ func (r *TransportURLReconciler) reconcileNormal(ctx context.Context, instance *
630630
if err != nil && !k8s_errors.IsNotFound(err) {
631631
return ctrl.Result{}, err
632632
}
633-
if err == nil && rabbitmqv1.HasTransportConsumerFinalizer(oldSecret) {
633+
if err == nil && hasTransportConsumerFinalizer(oldSecret) {
634634
Log.Info("Waiting for consumer to release previous transport secret",
635635
"secret", instance.Status.PreviousSecretName)
636636
return ctrl.Result{RequeueAfter: PendingReleaseCheckInterval}, nil
@@ -1059,7 +1059,7 @@ func (r *TransportURLReconciler) tryReleasePendingUser(ctx context.Context, inst
10591059
if err != nil && !k8s_errors.IsNotFound(err) {
10601060
return false, err
10611061
}
1062-
if err == nil && rabbitmqv1.HasTransportConsumerFinalizer(oldSecret) {
1062+
if err == nil && hasTransportConsumerFinalizer(oldSecret) {
10631063
Log.Info("Waiting for consumer to release old transport secret",
10641064
"secret", instance.Status.PreviousSecretName,
10651065
"pendingUser", pendingRef)
@@ -1310,6 +1310,16 @@ func (r *TransportURLReconciler) deleteLegacyOwnedResources(ctx context.Context,
13101310
return nil
13111311
}
13121312

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

0 commit comments

Comments
 (0)