Skip to content

Commit 090566c

Browse files
committed
clean-up velero restore resources when delete restorejob
1 parent 37bc12a commit 090566c

1 file changed

Lines changed: 49 additions & 0 deletions

File tree

‎internal/backupcontroller/restorejob_controller.go‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"net/http"
77

8+
corev1 "k8s.io/api/core/v1"
89
apierrors "k8s.io/apimachinery/pkg/api/errors"
910
"k8s.io/apimachinery/pkg/api/meta"
1011
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -16,12 +17,16 @@ import (
1617
ctrl "sigs.k8s.io/controller-runtime"
1718
"sigs.k8s.io/controller-runtime/pkg/client"
1819
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
20+
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1921
"sigs.k8s.io/controller-runtime/pkg/log"
2022

2123
strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
2224
backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
25+
velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
2326
)
2427

28+
const restoreJobFinalizer = "backups.cozystack.io/cleanup-velero-restore"
29+
2530
// RestoreJobReconciler reconciles RestoreJob objects.
2631
// It routes RestoreJobs to strategy-specific handlers based on the strategy
2732
// referenced in the Backup that the RestoreJob is restoring from.
@@ -48,6 +53,27 @@ func (r *RestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
4853
return ctrl.Result{}, err
4954
}
5055

56+
// Handle deletion: clean up Velero Restore
57+
if !restoreJob.DeletionTimestamp.IsZero() {
58+
if controllerutil.ContainsFinalizer(restoreJob, restoreJobFinalizer) {
59+
r.cleanupVeleroRestore(ctx, restoreJob)
60+
controllerutil.RemoveFinalizer(restoreJob, restoreJobFinalizer)
61+
if err := r.Update(ctx, restoreJob); err != nil {
62+
return ctrl.Result{}, err
63+
}
64+
logger.V(1).Info("removed finalizer and cleaned up Velero Restore", "restoreJob", restoreJob.Name)
65+
}
66+
return ctrl.Result{}, nil
67+
}
68+
69+
// Ensure finalizer is present
70+
if !controllerutil.ContainsFinalizer(restoreJob, restoreJobFinalizer) {
71+
controllerutil.AddFinalizer(restoreJob, restoreJobFinalizer)
72+
if err := r.Update(ctx, restoreJob); err != nil {
73+
return ctrl.Result{}, err
74+
}
75+
}
76+
5177
// If already completed, no need to reconcile
5278
if restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
5379
restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
@@ -126,3 +152,26 @@ func (r *RestoreJobReconciler) markRestoreJobFailed(ctx context.Context, restore
126152
logger.Debug("RestoreJob failed", "message", message)
127153
return ctrl.Result{}, nil
128154
}
155+
156+
// cleanupVeleroRestore deletes all Velero Restores and resourceModifier
157+
// ConfigMaps owned by this RestoreJob (identified by labels).
158+
func (r *RestoreJobReconciler) cleanupVeleroRestore(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob) {
159+
logger := log.FromContext(ctx)
160+
opts := []client.DeleteAllOfOption{
161+
client.InNamespace(veleroNamespace),
162+
client.MatchingLabels{
163+
backupsv1alpha1.OwningJobNameLabel: restoreJob.Name,
164+
backupsv1alpha1.OwningJobNamespaceLabel: restoreJob.Namespace,
165+
},
166+
}
167+
168+
if err := r.DeleteAllOf(ctx, &velerov1.Restore{}, opts...); err != nil {
169+
logger.Error(err, "failed to delete Velero Restore(s)")
170+
r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "CleanupFailed",
171+
fmt.Sprintf("Failed to delete Velero Restore: %v", err))
172+
}
173+
174+
if err := r.DeleteAllOf(ctx, &corev1.ConfigMap{}, opts...); err != nil {
175+
logger.Error(err, "failed to delete resourceModifiers ConfigMap(s)")
176+
}
177+
}

0 commit comments

Comments
 (0)