fix: Delete ETCDMachineSnapshot resources if their corresponding snapshot gets deleted

exp/etcdrestore/controllers/etcdsnapshotsync_controller.go

@@ -152,7 +152,7 @@ func (r *EtcdSnapshotSyncReconciler) etcdSnapshotFile(ctx context.Context, clust
 		}
 
 		if o.GetObjectKind().GroupVersionKind() != gvk {
-			log.Error(fmt.Errorf("got a different object"), "objectGVK", o.GetObjectKind().GroupVersionKind().String())
+			log.Error(fmt.Errorf("got a different object"), "unexpected object, will not enqueue request", "objectGVK", o.GetObjectKind().GroupVersionKind().String())
 			return nil
 		}
 

exp/etcdrestore/controllers/snapshotters/rke2snapshotter.go

@@ -125,6 +125,37 @@ func (s *RKE2Snapshotter) Sync(ctx context.Context) error {
 		return fmt.Errorf("failed to create/modify EtcdMachineSnapshot status: %w", err)
 	}
 
+	// Get all ETCDMachineSnapshot resources for this cluster
+	etcdMachineSnapshotList := &snapshotrestorev1.ETCDMachineSnapshotList{}
+	if err := s.List(ctx, etcdMachineSnapshotList, client.MatchingFields{
+		"spec.clusterName": s.cluster.Name,
+	}); err != nil {
+		return fmt.Errorf("failed to list ETCDMachineSnapshot resources for cluster %s: %w", s.cluster.Name, err)
+	}
+
+	// Delete any ETCDMachineSnapshot resources marked as Done that don't have a corresponding ETCDSnapshotFile
+	for _, snapshot := range etcdMachineSnapshotList.Items {
+		if snapshot.Status.Phase != snapshotrestorev1.ETCDSnapshotPhaseDone {
+			continue
+		}
+
+		found := false
+		for _, snapshotFile := range etcdnapshotFileList.Items {
+			if *snapshot.Status.SnapshotFileName == snapshotFile.Name {
+				found = true
+				log.V(5).Info("Found corresponding ETCDSnapshotFile for ETCDMachineSnapshot", "name", snapshot.Name, "snapshotFileName", snapshotFile.Name)
+				break
+			}
+		}
+
+		if !found {
+			log.Info("Deleting ETCDMachineSnapshot without a corresponding ETCDSnapshotFile", "name", snapshot.Name)
+			if err := s.Delete(ctx, &snapshot); err != nil {
+				return fmt.Errorf("failed to delete ETCDMachineSnapshot: %w", err)
+			}
+		}
+	}
+
 	return nil
 }
 

exp/etcdrestore/main.go

@@ -224,12 +224,19 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager) {
 
 	setupLog.Info("enabling ETCDMachineSnapshot controller")
 
+	if err := mgr.GetFieldIndexer().IndexField(ctx, &snapshotrestorev1.ETCDMachineSnapshot{}, "spec.clusterName", func(o client.Object) []string {
+		return []string{o.(*snapshotrestorev1.ETCDMachineSnapshot).Spec.ClusterName}
+	}); err != nil {
+		setupLog.Error(err, "unable to create field indexer for ETCDMachineSnapshot")
+		os.Exit(1)
+	}
+
 	if err := (&expcontrollers.ETCDMachineSnapshotReconciler{
 		Client:           mgr.GetClient(),
 		Tracker:          tracker,
 		WatchFilterValue: watchFilterValue,
 	}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: concurrencyNumber}); err != nil {
-		setupLog.Error(err, "unable to create EtcdMachineSnapshot controller")
+		setupLog.Error(err, "unable to create ETCDMachineSnapshot controller")
 		os.Exit(1)
 	}