fix(images): fix image deletion connected to stopped VMs (#1669)

Signed-off-by: Valeriy Khorunzhin <[email protected]>

Author: eofff

images/virtualization-artifact/pkg/common/vm/vm.go

@@ -17,10 +17,18 @@ limitations under the License.
 package vm
 
 import (
+	"context"
+	"fmt"
 	"strings"
 
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
+	virtv1 "kubevirt.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/deckhouse/virtualization-controller/pkg/common/object"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vmcondition"
@@ -82,3 +90,30 @@ func RestartRequired(vm *v1alpha2.VirtualMachine) bool {
 func IsComputeContainer(name string) bool {
 	return strings.HasSuffix(name, VMContainerNameSuffix)
 }
+
+func IsVMActive(ctx context.Context, cli client.Client, vm v1alpha2.VirtualMachine) (bool, error) {
+	kvvm, err := object.FetchObject(ctx, types.NamespacedName{Name: vm.Name, Namespace: vm.Namespace}, cli, &virtv1.VirtualMachine{})
+	if err != nil {
+		return false, fmt.Errorf("error getting kvvms: %w", err)
+	}
+	if kvvm != nil && kvvm.Status.StateChangeRequests != nil {
+		return true, nil
+	}
+
+	podList := corev1.PodList{}
+	err = cli.List(ctx, &podList, &client.ListOptions{
+		Namespace:     vm.GetNamespace(),
+		LabelSelector: labels.SelectorFromSet(map[string]string{virtv1.VirtualMachineNameLabel: vm.GetName()}),
+	})
+	if err != nil {
+		return false, fmt.Errorf("unable to list virt-launcher Pod for VM %q: %w", vm.GetName(), err)
+	}
+
+	for _, pod := range podList.Items {
+		if pod.Status.Phase == corev1.PodRunning {
+			return true, nil
+		}
+	}
+
+	return false, nil
+}

images/virtualization-artifact/pkg/controller/cvi/internal/attachee.go

@@ -24,6 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	commonvm "github.com/deckhouse/virtualization-controller/pkg/common/vm"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
@@ -68,6 +69,21 @@ func (h AttacheeHandler) hasAttachedVM(ctx context.Context, cvi client.Object) (
 	}
 
 	for _, vm := range vms.Items {
+		if vm.Status.Phase == "" {
+			continue
+		}
+
+		if vm.Status.Phase == v1alpha2.MachineStopped {
+			vmIsActive, err := commonvm.IsVMActive(ctx, h.client, vm)
+			if err != nil {
+				return false, err
+			}
+
+			if !vmIsActive {
+				continue
+			}
+		}
+
 		if h.isCVIAttachedToVM(cvi.GetName(), vm) {
 			return true, nil
 		}

images/virtualization-artifact/pkg/controller/vd/internal/inuse.go

@@ -23,15 +23,14 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
-	virtv1 "kubevirt.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
 	commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
+	commonvm "github.com/deckhouse/virtualization-controller/pkg/common/vm"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
@@ -182,7 +181,7 @@ func (h InUseHandler) getVirtualMachineUsageMap(ctx context.Context, vd *v1alpha
 		case v1alpha2.MachinePending:
 			usageMap[vm.GetName()] = true
 		case v1alpha2.MachineStopped:
-			vmIsActive, err := h.isVMActive(ctx, vm)
+			vmIsActive, err := commonvm.IsVMActive(ctx, h.client, vm)
 			if err != nil {
 				return nil, err
 			}
@@ -196,33 +195,6 @@ func (h InUseHandler) getVirtualMachineUsageMap(ctx context.Context, vd *v1alpha
 	return usageMap, nil
 }
 
-func (h InUseHandler) isVMActive(ctx context.Context, vm v1alpha2.VirtualMachine) (bool, error) {
-	kvvm, err := object.FetchObject(ctx, types.NamespacedName{Name: vm.Name, Namespace: vm.Namespace}, h.client, &virtv1.VirtualMachine{})
-	if err != nil {
-		return false, fmt.Errorf("error getting kvvms: %w", err)
-	}
-	if kvvm != nil && kvvm.Status.StateChangeRequests != nil {
-		return true, nil
-	}
-
-	podList := corev1.PodList{}
-	err = h.client.List(ctx, &podList, &client.ListOptions{
-		Namespace:     vm.GetNamespace(),
-		LabelSelector: labels.SelectorFromSet(map[string]string{virtv1.VirtualMachineNameLabel: vm.GetName()}),
-	})
-	if err != nil {
-		return false, fmt.Errorf("unable to list virt-launcher Pod for VM %q: %w", vm.GetName(), err)
-	}
-
-	for _, pod := range podList.Items {
-		if pod.Status.Phase == corev1.PodRunning {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
 func (h InUseHandler) updateAttachedVirtualMachinesStatus(vd *v1alpha2.VirtualDisk, usageMap map[string]bool) {
 	currentlyMountedVM := commonvd.GetCurrentlyMountedVMName(vd)
 

images/virtualization-artifact/pkg/controller/vi/internal/attachee.go

@@ -24,6 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	commonvm "github.com/deckhouse/virtualization-controller/pkg/common/vm"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
@@ -74,6 +75,21 @@ func (h AttacheeHandler) hasAttachedVM(ctx context.Context, vi client.Object) (b
 	}
 
 	for _, vm := range vms.Items {
+		if vm.Status.Phase == "" {
+			continue
+		}
+
+		if vm.Status.Phase == v1alpha2.MachineStopped {
+			vmIsActive, err := commonvm.IsVMActive(ctx, h.client, vm)
+			if err != nil {
+				return false, err
+			}
+
+			if !vmIsActive {
+				continue
+			}
+		}
+
 		if h.isVIAttachedToVM(vi.GetName(), vm) {
 			return true, nil
 		}