fix

Signed-off-by: yaroslavborbat <[email protected]>
deckhouse · Jan 18, 2025 · 9de8c9c · 9de8c9c
1 parent e30014e
commit 9de8c9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/service/attachment_service.go b/images/virtualization-artifact/pkg/controller/service/attachment_service.go
@@ -160,9 +160,6 @@ func (s AttachmentService) CanUnplug(kvvm *virtv1.VirtualMachine, diskName strin
 	}
 
 	for _, volume := range kvvm.Spec.Template.Spec.Volumes {
-		if volume.Name == diskName {
-			return true
-		}
 		if kvapi.VolumeExists(volume, diskName) {
 			return true
 		}

diff --git a/images/virtualization-artifact/pkg/controller/vmbda/internal/deletion.go b/images/virtualization-artifact/pkg/controller/vmbda/internal/deletion.go
@@ -18,6 +18,7 @@ package internal
 
 import (
 	"context"
+	"log/slog"
 
 	"k8s.io/apimachinery/pkg/types"
 	virtv1 "kubevirt.io/api/core/v1"
@@ -40,6 +41,8 @@ type UnplugInterface interface {
 type DeletionHandler struct {
 	unplug UnplugInterface
 	client client.Client
+
+	log *slog.Logger
 }
 
 func NewDeletionHandler(unplug UnplugInterface, client client.Client) *DeletionHandler {
@@ -49,13 +52,14 @@ func NewDeletionHandler(unplug UnplugInterface, client client.Client) *DeletionH
 	}
 }
 
-func (h DeletionHandler) Handle(ctx context.Context, vmbda *virtv2.VirtualMachineBlockDeviceAttachment) (reconcile.Result, error) {
-	log := logger.FromContext(ctx).With(logger.SlogHandler(deletionHandlerName))
+func (h *DeletionHandler) Handle(ctx context.Context, vmbda *virtv2.VirtualMachineBlockDeviceAttachment) (reconcile.Result, error) {
+	h.log = logger.FromContext(ctx).With(logger.SlogHandler(deletionHandlerName))
+
 	if vmbda.DeletionTimestamp != nil {
 		if err := h.cleanUp(ctx, vmbda); err != nil {
 			return reconcile.Result{}, err
 		}
-		log.Info("Deletion observed: remove cleanup finalizer from VirtualMachineBlockDeviceAttachment")
+		h.log.Info("Deletion observed: remove cleanup finalizer from VirtualMachineBlockDeviceAttachment")
 		controllerutil.RemoveFinalizer(vmbda, virtv2.FinalizerVMBDACleanup)
 		return reconcile.Result{}, nil
 	}
@@ -64,7 +68,7 @@ func (h DeletionHandler) Handle(ctx context.Context, vmbda *virtv2.VirtualMachin
 	return reconcile.Result{}, nil
 }
 
-func (h DeletionHandler) cleanUp(ctx context.Context, vmbda *virtv2.VirtualMachineBlockDeviceAttachment) error {
+func (h *DeletionHandler) cleanUp(ctx context.Context, vmbda *virtv2.VirtualMachineBlockDeviceAttachment) error {
 	if vmbda == nil {
 		return nil
 	}
@@ -85,6 +89,7 @@ func (h DeletionHandler) cleanUp(ctx context.Context, vmbda *virtv2.VirtualMachi
 	}
 
 	if h.unplug.CanUnplug(kvvm, diskName) {
+		h.log.Info("Unplug Virtual Disk", slog.String("diskName", diskName), slog.String("vm", kvvm.Name))
 		if err = h.unplug.UnplugDisk(ctx, kvvm, diskName); err != nil {
 			return err
 		}