address coderabbitai comments

Author: kasabe28

internal/controllers/image_controller.go

@@ -325,9 +325,20 @@ func (r *ImageReconciler) deleteImageSnapshots(ctx context.Context, log logr.Log
 }
 
 func (r *ImageReconciler) cloneSnapshot(ctx context.Context, log logr.Logger, ioCtx *rados.IOContext, snapName string, image *providerapi.Image) error {
-	if imageExists, err := r.isImageExisting(ioCtx, snapName); err != nil {
-		return fmt.Errorf("failed to check image existence: %w", err)
-	} else if imageExists {
+	rbdExists, err := r.isImageExisting(ioCtx, snapName)
+	if err != nil {
+		return fmt.Errorf("failed to check rbd image existence: %w", err)
+	}
+
+	storeExists := true
+	if _, err := r.images.Get(ctx, snapName); err != nil {
+		if !errors.Is(err, store.ErrNotFound) {
+			return fmt.Errorf("failed to check image in store: %w", err)
+		}
+		storeExists = false
+	}
+
+	if rbdExists && storeExists {
 		log.V(2).Info("Snapshot clone is already created")
 		return nil
 	}

internal/volumeserver/volume_create.go

@@ -89,6 +89,9 @@ func (s *Server) createImageFromVolume(ctx context.Context, log logr.Logger, vol
 				return nil, fmt.Errorf("requested size (%d bytes) must not be smaller than snapshot restore size (%d bytes)", imageSize, snapshotSize)
 			}
 			if snapshotSourceVolume.Spec.Encryption != nil {
+				if encryptionSpec != nil {
+					log.V(2).Info("Overriding user-provided encryption with snapshot source encryption")
+				}
 				encryptionSpec = snapshotSourceVolume.Spec.Encryption
 			}
 
@@ -98,6 +101,9 @@ func (s *Server) createImageFromVolume(ctx context.Context, log logr.Logger, vol
 			if volImage == "" {
 				return nil, fmt.Errorf("must specify image url in image data source")
 			}
+			if imageSize == 0 {
+				return nil, fmt.Errorf("must specify size when creating volume from image data source")
+			}
 
 		default:
 			return nil, fmt.Errorf("unsupported or incomplete volume data source type")