CR fixes

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>
kubevirt · Apr 27, 2023 · a202278 · a202278
1 parent 38c569c
commit a202278
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/pkg/controller/datavolume/controller-base.go b/pkg/controller/datavolume/controller-base.go
@@ -192,6 +192,16 @@ func getIndexArgs() []indexArgs {
 				return nil
 			},
 		},
+		{
+			obj:   &corev1.PersistentVolume{},
+			field: claimStorageClassNameField,
+			extractValue: func(obj client.Object) []string {
+				if pv, ok := obj.(*corev1.PersistentVolume); ok && pv.Status.Phase == corev1.VolumeAvailable {
+					return []string{pv.Spec.StorageClassName}
+				}
+				return nil
+			},
+		},
 	}
 }
 
@@ -206,14 +216,6 @@ func CreateCommonIndexes(mgr manager.Manager) error {
 			return err
 		}
 	}
-	if err := mgr.GetFieldIndexer().IndexField(context.TODO(), &corev1.PersistentVolume{}, claimStorageClassNameField, func(obj client.Object) []string {
-		if pv, ok := obj.(*corev1.PersistentVolume); ok {
-			return []string{pv.Spec.StorageClassName}
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -322,6 +324,7 @@ func addDataVolumeControllerCommonWatches(mgr manager.Manager, dataVolumeControl
 				if storage != nil &&
 					storage.StorageClassName != nil &&
 					*storage.StorageClassName == pv.Spec.StorageClassName &&
+					pv.Status.Phase == corev1.VolumeAvailable &&
 					getDataVolumeOp(mgr.GetLogger(), &dv, mgr.GetClient()) == op {
 					reqs = append(reqs, reconcile.Request{NamespacedName: types.NamespacedName{Name: dv.Name, Namespace: dv.Namespace}})
 				}
@@ -446,11 +449,15 @@ func (r *ReconcilerBase) syncDvPvcState(log logr.Logger, req reconcile.Request,
 		}
 	}
 
-	syncState.pvcSpec, err = renderPvcSpec(r.client, r.recorder, log, dv)
-	if err != nil {
-		r.syncDataVolumeStatusPhaseWithEvent(&syncState, cdiv1.PhaseUnset, nil,
-			Event{corev1.EventTypeWarning, cc.ErrClaimNotValid, err.Error()})
-		return syncState, err
+	if syncState.pvc == nil {
+		syncState.pvcSpec, err = renderPvcSpec(r.client, r.recorder, log, dv)
+		if err != nil {
+			r.syncDataVolumeStatusPhaseWithEvent(&syncState, cdiv1.PhaseUnset, nil,
+				Event{corev1.EventTypeWarning, cc.ErrClaimNotValid, err.Error()})
+			return syncState, err
+		}
+	} else {
+		syncState.pvcSpec = syncState.pvc.Spec.DeepCopy()
 	}
 
 	if err := r.handleStaticVolume(&syncState, log); err != nil || syncState.result != nil {

diff --git a/pkg/controller/datavolume/util.go b/pkg/controller/datavolume/util.go
@@ -78,7 +78,7 @@ func pvcFromStorage(client client.Client, recorder record.EventRecorder, log log
 	}
 	if storageClass == nil {
 		// If SC was not found, look for PV with this SC name
-		pv, err := getPV(client, pvcSpec, dv.Name, dv.Namespace)
+		pv, err := getAvailablePV(client, pvcSpec, dv.Name, dv.Namespace)
 		if err != nil {
 			return nil, err
 		}
@@ -160,8 +160,8 @@ func copyStorageAsPvc(log logr.Logger, storage *cdiv1.StorageSpec) *v1.Persisten
 	return pvcSpec
 }
 
-// Gets either the bound PV or an available satisfying PV
-func getPV(c client.Client, pvcSpec *v1.PersistentVolumeClaimSpec, pvcName, pvcNamespace string) (*corev1.PersistentVolume, error) {
+// Gets an available satisfying PV
+func getAvailablePV(c client.Client, pvcSpec *v1.PersistentVolumeClaimSpec, pvcName, pvcNamespace string) (*corev1.PersistentVolume, error) {
 	if pvcSpec.StorageClassName == nil {
 		return nil, nil
 	}
@@ -171,14 +171,6 @@ func getPV(c client.Client, pvcSpec *v1.PersistentVolumeClaimSpec, pvcName, pvcN
 	if err := c.List(context.TODO(), pvList, fields); err != nil {
 		return nil, err
 	}
-	for _, pv := range pvList.Items {
-		if pv.Status.Phase == corev1.VolumeBound &&
-			pv.Spec.ClaimRef != nil &&
-			pv.Spec.ClaimRef.Name == pvcName &&
-			pv.Spec.ClaimRef.Namespace == pvcNamespace {
-			return &pv, nil
-		}
-	}
 	for _, pv := range pvList.Items {
 		if pv.Status.Phase == corev1.VolumeAvailable {
 			pvc := &corev1.PersistentVolumeClaim{Spec: *pvcSpec}

diff --git a/tests/datavolume_test.go b/tests/datavolume_test.go
@@ -2421,7 +2421,7 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
 			err = utils.WaitForPersistentVolumeClaimPhase(f.K8sClient, dataVolume.Namespace, v1.ClaimBound, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 
-			By("waiting for dv succeeeded")
+			By("waiting for dv succeeded")
 			err = utils.WaitForDataVolumePhase(f, dataVolume.Namespace, cdiv1.Succeeded, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 		},
@@ -2479,7 +2479,7 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
 			err = utils.WaitForPersistentVolumeClaimPhase(f.K8sClient, dataVolume.Namespace, v1.ClaimBound, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 
-			By("waiting for dv succeeeded")
+			By("waiting for dv succeeded")
 			err = utils.WaitForDataVolumePhase(f, dataVolume.Namespace, cdiv1.Succeeded, dataVolume.Name)
 			Expect(err).ToNot(HaveOccurred())
 		},