feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #18004 from rook/mergify/bp/release-1.20/pr-17962

Browse Source 
rgw: rgw account deletion should remove account from ceph (backport #17962)
This commit is contained in:
Travis Nielsen
2026-07-22 09:27:35 -06:00
committed by GitHub
parent 97f026f602 3010491f03
commit a96bbe74e0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/object/account/controller.go
+8
View File
@@ -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 {