[oadp-1.2] OADP-1821: Add storageClass mapping for volumeOptions (#225)

Co-authored-by: Emily McMullan <emcmulla@redhat.com>
migtools · May 19, 2023 · 3b2cddc · 3b2cddc
1 parent e8e117f
commit 3b2cddc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/controllers/common.go b/controllers/common.go
@@ -64,8 +64,6 @@ const (
 	DatamoverSourcePVCName    = "datamover.io/source-pvc-name"
 	DatamoverSourcePVCSize    = "datamover.io/source-pvc-size"
 
-	DataMoverConfMapName = "datamover-config"
-
 	// Providers
 	AWSProvider   = "aws"
 	AzureProvider = "azure"
@@ -550,10 +548,10 @@ func updateVSBStatusPhase(vsb *volsnapmoverv1alpha1.VolumeSnapshotBackup, phase
 	return nil
 }
 
-func GetDataMoverConfigMap(namespace string, log logr.Logger, client client.Client) (*corev1.ConfigMap, error) {
+func GetDataMoverConfigMap(namespace string, sc string, log logr.Logger, client client.Client) (*corev1.ConfigMap, error) {
 
 	cm := corev1.ConfigMap{}
-	err := client.Get(context.Background(), types.NamespacedName{Namespace: namespace, Name: DataMoverConfMapName}, &cm)
+	err := client.Get(context.Background(), types.NamespacedName{Namespace: namespace, Name: fmt.Sprintf("%v-config", sc)}, &cm)
 	// configmap will not exist if config values were not set
 	if k8serrors.IsNotFound(err) {
 		return nil, nil

diff --git a/controllers/pvc.go b/controllers/pvc.go
@@ -56,11 +56,6 @@ func (r *VolumeSnapshotBackupReconciler) MirrorPVC(log logr.Logger) (bool, error
 		return false, nil
 	}
 
-	cm, err := GetDataMoverConfigMap(vsb.Spec.ProtectedNamespace, r.Log, r.Client)
-	if err != nil {
-		return false, err
-	}
-
 	// Create a PVC with the above volumesnapshot clone as the source
 
 	pvcClone := &corev1.PersistentVolumeClaim{
@@ -75,7 +70,7 @@ func (r *VolumeSnapshotBackupReconciler) MirrorPVC(log logr.Logger) (bool, error
 
 	op, err := controllerutil.CreateOrUpdate(r.Context, r.Client, pvcClone, func() error {
 
-		return r.buildPVCClone(pvcClone, &vsClone, cm)
+		return r.buildPVCClone(pvcClone, &vsClone)
 	})
 	if err != nil {
 		r.Log.Info(fmt.Sprintf("err building pvc clone: %v", err))
@@ -93,12 +88,23 @@ func (r *VolumeSnapshotBackupReconciler) MirrorPVC(log logr.Logger) (bool, error
 	return true, nil
 }
 
-func (r *VolumeSnapshotBackupReconciler) buildPVCClone(pvcClone *corev1.PersistentVolumeClaim, vsClone *snapv1.VolumeSnapshot, cm *corev1.ConfigMap) error {
+func (r *VolumeSnapshotBackupReconciler) buildPVCClone(pvcClone *corev1.PersistentVolumeClaim, vsClone *snapv1.VolumeSnapshot) error {
 	sourcePVC, err := r.getSourcePVC()
 	if err != nil {
 		return err
 	}
 
+	// fetch VSB again from cluster as status was updated in getSourcePVC()
+	vsb := volsnapmoverv1alpha1.VolumeSnapshotBackup{}
+	if err := r.Get(r.Context, r.req.NamespacedName, &vsb); err != nil {
+		return err
+	}
+
+	cm, err := GetDataMoverConfigMap(vsb.Spec.ProtectedNamespace, vsb.Status.SourcePVCData.StorageClassName, r.Log, r.Client)
+	if err != nil {
+		return err
+	}
+
 	if pvcClone.CreationTimestamp.IsZero() {
 		apiGroup := "snapshot.storage.k8s.io"
 		pvcClone.Spec.DataSource = &corev1.TypedLocalObjectReference{
@@ -210,7 +216,7 @@ func (r *VolumeSnapshotBackupReconciler) BindPVCToDummyPod(log logr.Logger) (boo
 		},
 	}
 
-	cm, err := GetDataMoverConfigMap(vsb.Spec.ProtectedNamespace, r.Log, r.Client)
+	cm, err := GetDataMoverConfigMap(vsb.Spec.ProtectedNamespace, vsb.Status.SourcePVCData.StorageClassName, r.Log, r.Client)
 	if err != nil {
 		return false, err
 	}

diff --git a/controllers/replicationdestination.go b/controllers/replicationdestination.go
@@ -53,7 +53,7 @@ func (r *VolumeSnapshotRestoreReconciler) CreateReplicationDestination(log logr.
 		return false, err
 	}
 
-	cm, err := GetDataMoverConfigMap(vsr.Spec.ProtectedNamespace, r.Log, r.Client)
+	cm, err := GetDataMoverConfigMap(vsr.Spec.ProtectedNamespace, vsr.Spec.VolumeSnapshotMoverBackupref.BackedUpPVCData.StorageClassName, r.Log, r.Client)
 	if err != nil {
 		return false, err
 	}

diff --git a/controllers/replicationsource.go b/controllers/replicationsource.go
@@ -44,7 +44,11 @@ func (r *VolumeSnapshotBackupReconciler) CreateReplicationSource(log logr.Logger
 		return false, err
 	}
 
-	cm, err := GetDataMoverConfigMap(vsb.Spec.ProtectedNamespace, r.Log, r.Client)
+	if len(vsb.Status.SourcePVCData.Name) == 0 {
+		return false, nil
+	}
+
+	cm, err := GetDataMoverConfigMap(vsb.Spec.ProtectedNamespace, vsb.Status.SourcePVCData.StorageClassName, r.Log, r.Client)
 	if err != nil {
 		return false, err
 	}