Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit 68082cc

Browse files
committed
Remove the secret on deletion of the bucketAccess
1 parent c3f21e9 commit 68082cc

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

Diff for: pkg/bucketaccess/bucketaccess_controller.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (bal *BucketAccessListener) deleteBucketAccessOp(ctx context.Context, bucke
331331
}
332332

333333
if controllerutil.RemoveFinalizer(secret, consts.SecretFinalizer) {
334-
_, err = bal.secrets(bucketAccess.ObjectMeta.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
334+
_, err = bal.secrets(secret.ObjectMeta.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
335335
if err != nil {
336336
klog.V(3).ErrorS(err, "Error removing finalizer from secret",
337337
"secret", secret.ObjectMeta.Name,
@@ -342,6 +342,15 @@ func (bal *BucketAccessListener) deleteBucketAccessOp(ctx context.Context, bucke
342342
klog.V(5).Infof("Successfully removed finalizer from secret: %s, bucketAccess: %s", secret.ObjectMeta.Name, bucketAccess.ObjectMeta.Name)
343343
}
344344

345+
err = bal.secrets(secret.ObjectMeta.Namespace).Delete(ctx, credSecretName, metav1.DeleteOptions{})
346+
if err != nil {
347+
klog.V(3).ErrorS(err, "Error deleting secret",
348+
"secret", secret.ObjectMeta.Name,
349+
"bucketAccess", bucketAccess.ObjectMeta.Name,
350+
"ns", bucketAccess.ObjectMeta.Namespace)
351+
return nil
352+
}
353+
345354
if controllerutil.RemoveFinalizer(bucketAccess, consts.BAFinalizer) {
346355
_, err = bal.bucketAccesses(bucketAccess.ObjectMeta.Namespace).Update(ctx, bucketAccess, metav1.UpdateOptions{})
347356
if err != nil {

0 commit comments

Comments
 (0)