f

Author: skogta

pkg/syncer/cnsoperator/controller/cnsnodevmbatchattachment/cnsnodevmbatchattachment_helper.go

@@ -152,7 +152,7 @@ func getVolumesToDetachForVmFromVC(ctx context.Context,
 
 	pvcsToDetach := make(map[string]string)
 	// Get all PVCs and their corresponding volumeID mapping from instance spec.
-	volumeIdsInSpec, volumeNamesInSpec, err := getVolumeNameVolumeIdMapsInSpec(ctx, instance)
+	volumeIdsInSpec, volumeNamesInSpec, err := getVolumeNameVolumeIdMapsInSpec(ctx, instance, client)
 	if err != nil {
 		log.Errorf("failed to get PVCs in spec. Err: %s", err)
 		return pvcsToDetach, err
@@ -248,7 +248,8 @@ func deleteVolumeFromStatus(pvc string, instance *v1alpha1.CnsNodeVmBatchAttachm
 // 1. volumeID to PVC name
 // 2. VolumeName to PVC name
 func getVolumeNameVolumeIdMapsInSpec(ctx context.Context,
-	instance *v1alpha1.CnsNodeVmBatchAttachment) (volumeIdsInSpec map[string]string,
+	instance *v1alpha1.CnsNodeVmBatchAttachment,
+	client client.Client) (volumeIdsInSpec map[string]string,
 	volumeNamesInSpec map[string]string, err error) {
 	log := logger.GetLogger(ctx)
 
@@ -270,12 +271,13 @@ func getVolumeNameVolumeIdMapsInSpec(ctx context.Context,
 }
 
 // getPvcsInSpec returns map of PVCs and their volumeIDs.
-func getPvcsInSpec(instance *v1alpha1.CnsNodeVmBatchAttachment) (map[string]string, error) {
+func getPvcsInSpec(ctx context.Context, instance *v1alpha1.CnsNodeVmBatchAttachment, client client.Client) (map[string]string, error) {
 	pvcsInSpec := make(map[string]string)
 	for _, volume := range instance.Spec.Volumes {
 		namespacedPvcName := getNamespacedPvcName(instance.Namespace, volume.PersistentVolumeClaim.ClaimName)
 		volumeId, ok := commonco.ContainerOrchestratorUtility.GetVolumeIDFromPVCName(namespacedPvcName)
 		if !ok {
+
 			return pvcsInSpec, fmt.Errorf("failed to find volumeID for PVC %s", volume.PersistentVolumeClaim.ClaimName)
 		}
 		pvcsInSpec[volume.PersistentVolumeClaim.ClaimName] = volumeId
@@ -461,7 +463,7 @@ func getVolumesToDetach(ctx context.Context, instance *v1alpha1.CnsNodeVmBatchAt
 
 	if instance.DeletionTimestamp != nil {
 		log.Debugf("Instance %s is being deleted, adding all volumes in spec to volumesToDetach list.", instance.Name)
-		volumesToDetach, err := getPvcsInSpec(instance)
+		volumesToDetach, err := getPvcsInSpec(ctx, instance, client)
 		if err != nil {
 			log.Errorf("failed to get volumes to detach from instance spec. Err: %s", err)
 			return volumesToDetach, err