remove unnecessary field MantleRestore.status.pool

`MantleRestore.status.pool` was kept to delete MR without MantleBackup.
But the procedure of deletion has changed, and the field is unused.

Signed-off-by: Yuji Ito <llamerada.jp@gmail.com>

Author: llamerada-jp

api/v1/mantlerestore_types.go

@@ -28,9 +28,6 @@ type MantleRestoreStatus struct {
 
 	// 'clusterID' specifies the Ceph cluster ID the source PV/PVC belongs to
 	ClusterID string `json:"clusterID,omitempty"`
-
-	// 'pool' specifies pool name the volumes are restored to
-	Pool string `json:"pool,omitempty"`
 }
 
 const (

charts/mantle-cluster-wide/templates/mantle.cybozu.io_mantlerestores.yaml

@@ -112,10 +112,6 @@ spec:
                   - type
                   type: object
                 type: array
-              pool:
-                description: '''pool'' specifies pool name the volumes are restored
-                  to'
-                type: string
             type: object
         type: object
     served: true

config/crd/bases/mantle.cybozu.io_mantlerestores.yaml

@@ -112,10 +112,6 @@ spec:
                   - type
                   type: object
                 type: array
-              pool:
-                description: '''pool'' specifies pool name the volumes are restored
-                  to'
-                type: string
             type: object
         type: object
     served: true

internal/controller/mantlerestore_controller.go

@@ -141,25 +141,6 @@ func (r *MantleRestoreReconciler) restore(ctx context.Context, restore *mantlev1
 		return requeueReconciliation(), nil
 	}
 
-	// store the pool name in the status
-	var pv corev1.PersistentVolume
-	err = json.Unmarshal([]byte(backup.Status.PVManifest), &pv)
-	if err != nil {
-		logger.Error(err, "failed to unmarshal PV manifest", "backup", backup.Name, "namespace", backup.Namespace)
-		return ctrl.Result{}, err
-	}
-	restore.Status.Pool = pv.Spec.CSI.VolumeAttributes["pool"]
-	if restore.Status.Pool == "" {
-		err := fmt.Errorf("pool not found in PV manifest")
-		logger.Error(err, "status.pool cannot be set", "backup", backup.Name, "namespace", backup.Namespace)
-		return ctrl.Result{}, err
-	}
-	err = r.client.Status().Update(ctx, restore)
-	if err != nil {
-		logger.Error(err, "failed to update status.pool", "status", restore.Status)
-		return ctrl.Result{}, err
-	}
-
 	// create a clone image from the backup
 	if err := r.cloneImageFromBackup(ctx, restore, &backup); err != nil {
 		logger.Error(err, "failed to clone image from backup", "backup", backup.Name, "namespace", backup.Namespace)
@@ -213,23 +194,27 @@ func (r *MantleRestoreReconciler) cloneImageFromBackup(ctx context.Context, rest
 	if bkImage == "" {
 		return fmt.Errorf("imageName not found in PV manifest")
 	}
+	pool := pv.Spec.CSI.VolumeAttributes["pool"]
+	if pool == "" {
+		return fmt.Errorf("pool not found in PV manifest")
+	}
 
-	images, err := r.ceph.RBDLs(restore.Status.Pool)
+	images, err := r.ceph.RBDLs(pool)
 	if err != nil {
 		return fmt.Errorf("failed to list RBD images: %w", err)
 	}
 
 	// check if the image already exists
 	if slices.Contains(images, r.restoringRBDImageName(restore)) {
-		info, err := r.ceph.RBDInfo(restore.Status.Pool, r.restoringRBDImageName(restore))
+		info, err := r.ceph.RBDInfo(pool, r.restoringRBDImageName(restore))
 		if err != nil {
 			return fmt.Errorf("failed to get RBD info: %w", err)
 		}
 		if info.Parent == nil {
 			return fmt.Errorf("failed to get RBD info: parent field is empty")
 		}
 
-		if info.Parent.Pool == restore.Status.Pool && info.Parent.Image == bkImage && info.Parent.Snapshot == backup.Name {
+		if info.Parent.Pool == pool && info.Parent.Image == bkImage && info.Parent.Snapshot == backup.Name {
 			logger.Info("image already exists", "image", r.restoringRBDImageName(restore))
 			return nil
 		} else {
@@ -245,7 +230,7 @@ func (r *MantleRestoreReconciler) cloneImageFromBackup(ctx context.Context, rest
 	}
 
 	// create a clone image from the backup
-	return r.ceph.RBDClone(restore.Status.Pool, bkImage, backup.Name, r.restoringRBDImageName(restore), features)
+	return r.ceph.RBDClone(pool, bkImage, backup.Name, r.restoringRBDImageName(restore), features)
 }
 
 func (r *MantleRestoreReconciler) createOrUpdateRestoringPV(ctx context.Context, restore *mantlev1.MantleRestore, backup *mantlev1.MantleBackup) error {

test/e2e/singlek8s/restore_test.go

@@ -412,7 +412,6 @@ func (test *restoreTest) testCloneImageFromBackup() {
 		},
 		Status: mantlev1.MantleRestoreStatus{
 			ClusterID: cephCluster1Namespace,
-			Pool:      test.poolName,
 		},
 	}
 	var info *rbdInfo