From 3010491f033cf5a337b54b7ebd0dfd9ae4077f7e Mon Sep 17 00:00:00 2001 From: parth-gr Date: Tue, 14 Jul 2026 15:53:58 +0530 Subject: [PATCH] rgw: rgw account deletion should remove account from ceph currently there was a bug in the code where it didnt removed the account from the ceph cluster during intial intialize Signed-off-by: parth-gr (cherry picked from commit cca7020f0b974d01120742fcad84c64c63f603c9) --- pkg/operator/ceph/object/account/controller.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/operator/ceph/object/account/controller.go b/pkg/operator/ceph/object/account/controller.go index 7b36153f9..1198eccc1 100644 --- a/pkg/operator/ceph/object/account/controller.go +++ b/pkg/operator/ceph/object/account/controller.go @@ -205,6 +205,14 @@ func (r *ReconcileObjectStoreAccount) reconcile(request reconcile.Request) (reco opsCtx, objectStore, err := object.InitializeObjectStoreContext(r.context, r.clusterInfo, r.client, r.opManagerContext, cephObjectStoreAccount.Spec.Store, newMultisiteAdminOpsCtxFunc) if err != nil { if !cephObjectStoreAccount.GetDeletionTimestamp().IsZero() { + log.NamedDebug(request.NamespacedName, logger, "deleting object store account") + r.recorder.Eventf(cephObjectStoreAccount, nil, corev1.EventTypeNormal, string(cephv1.ReconcileStarted), string(cephv1.ReconcileStarted), "deleting CephObjectStoreAccount %q", cephObjectStoreAccount.Name) + + err := r.deleteAccount(cephObjectStoreAccount) + if err != nil { + return reconcile.Result{}, *cephObjectStoreAccount, errors.Wrapf(err, "failed to delete ceph object store account %q", cephObjectStoreAccount.Name) + } + // Remove finalizer err = opcontroller.RemoveFinalizer(r.opManagerContext, r.client, cephObjectStoreAccount) if err != nil {