Skip to content

Commit e132a7a

Browse files
committed
Fix slow release deletion
1 parent 95a9c0b commit e132a7a

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

controllers/release_controller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@ func (r *ReleaseController) Reconcile(ctx context.Context, req reconcile.Request
7575
if !claim.GetDeletionTimestamp().IsZero() {
7676
return ctrl.Result{}, nil
7777
}
78+
{
79+
var ns corev1.Namespace
80+
if err := r.Get(ctx, client.ObjectKey{Name: instanceNSName}, &ns); err != nil && !apierrors.IsNotFound(err) {
81+
return ctrl.Result{}, fmt.Errorf("unknown error retrieving namespace for deletion check %s: %w", instanceNSName, err)
82+
}
83+
if !ns.DeletionTimestamp.IsZero() {
84+
l.Info("Previous release is being deleted, skipping release until deletion is complete", "namespace", instanceNSName)
85+
return ctrl.Result{RequeueAfter: 5 * time.Second}, nil
86+
}
87+
}
7888

7989
var revisions chrysopoeiav1.InstanceRevisionList
8090
if err := r.List(ctx, &revisions, client.InNamespace(req.Namespace), client.MatchingFields{ownerUIDField: string(claim.GetUID())}); err != nil {

0 commit comments

Comments
 (0)