fix(vm): choose correct active pod

images/virtualization-artifact/pkg/builder/vm/option.go

@@ -17,11 +17,13 @@ limitations under the License.
 package vm
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
+
 	"github.com/deckhouse/virtualization-controller/pkg/builder/meta"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
-type Option func(vmop *v1alpha2.VirtualMachine)
+type Option func(vm *v1alpha2.VirtualMachine)
 
 var (
 	WithName         = meta.WithName[*v1alpha2.VirtualMachine]
@@ -32,3 +34,18 @@ var (
 	WithAnnotation   = meta.WithAnnotation[*v1alpha2.VirtualMachine]
 	WithAnnotations  = meta.WithAnnotations[*v1alpha2.VirtualMachine]
 )
+
+func WithCPU(cores int, coreFraction *string) Option {
+	return func(vm *v1alpha2.VirtualMachine) {
+		vm.Spec.CPU.Cores = cores
+		if coreFraction != nil {
+			vm.Spec.CPU.CoreFraction = *coreFraction
+		}
+	}
+}
+
+func WithMemory(size resource.Quantity) Option {
+	return func(vm *v1alpha2.VirtualMachine) {
+		vm.Spec.Memory.Size = size
+	}
+}

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

@@ -17,8 +17,10 @@ limitations under the License.
 package kvvm
 
 import (
+	"cmp"
 	"context"
 	"fmt"
+	"slices"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -63,29 +65,38 @@ func FindPodByKVVMI(ctx context.Context, cli client.Client, kvvmi *virtv1.Virtua
 }
 
 func GetVMPod(kvvmi *virtv1.VirtualMachineInstance, podList *corev1.PodList) *corev1.Pod {
-	if len(podList.Items) == 0 {
+	if kvvmi == nil {
 		return nil
 	}
-	if len(podList.Items) == 1 {
-		return &podList.Items[0]
-	}
 
-	// If migration is completed - return the target pod.
-	if kvvmi != nil && kvvmi.Status.MigrationState != nil && kvvmi.Status.MigrationState.Completed {
-		for _, pod := range podList.Items {
-			if pod.Name == kvvmi.Status.MigrationState.TargetPod {
-				return &pod
-			}
+	var pods []corev1.Pod
+	for _, pod := range podList.Items {
+		if pod.Spec.NodeName != kvvmi.Status.NodeName {
+			continue
 		}
+		if _, exists := kvvmi.Status.ActivePods[pod.GetUID()]; !exists {
+			continue
+		}
+		pods = append(pods, pod)
 	}
 
-	// Return the first Running Pod or just a first Pod.
-	for _, pod := range podList.Items {
+	switch len(pods) {
+	case 0:
+		return nil
+	case 1:
+		return &pods[0]
+	}
+
+	slices.SortFunc(pods, func(a, b corev1.Pod) int {
+		return cmp.Compare(a.GetCreationTimestamp().UnixNano(), b.GetCreationTimestamp().UnixNano())
+	})
+
+	for _, pod := range pods {
 		if pod.Status.Phase == corev1.PodRunning {
 			return &pod
 		}
 	}
-	return &podList.Items[0]
+	return &pods[0]
 }
 
 // DeletePodByKVVMI deletes pod by kvvmi.

images/virtualization-artifact/pkg/controller/powerstate/operations_test.go

@@ -35,7 +35,9 @@ func TestRestartVM(t *testing.T) {
 	const (
 		vmName                = "test-vm"
 		vmNamespace           = "test-namespace"
-		uid         types.UID = "test-uid"
+		nodeName              = "worker-01"
+		kvvmiUID    types.UID = "test-kvvmi-uid"
+		podUID      types.UID = "test-pod-uid"
 	)
 	key := types.NamespacedName{
 		Name:      vmName,
@@ -57,21 +59,31 @@ func TestRestartVM(t *testing.T) {
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      vmName,
 				Namespace: vmNamespace,
-				UID:       uid,
+				UID:       kvvmiUID,
 			},
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "VirtualMachineInstance",
 				APIVersion: virtv1.SchemeGroupVersion.String(),
 			},
+			Status: virtv1.VirtualMachineInstanceStatus{
+				NodeName: nodeName,
+				ActivePods: map[types.UID]string{
+					podUID: vmName,
+				},
+			},
 		}
 		pod := &corev1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      vmName,
 				Namespace: vmNamespace,
 				Labels: map[string]string{
 					virtv1.AppLabel:       "virt-launcher",
-					virtv1.CreatedByLabel: string(uid),
+					virtv1.CreatedByLabel: string(kvvmiUID),
 				},
+				UID: podUID,
+			},
+			Spec: corev1.PodSpec{
+				NodeName: nodeName,
 			},
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "Pod",
@@ -118,7 +130,7 @@ func TestRestartVM(t *testing.T) {
 			require.Len(t, newKVVM.Status.StateChangeRequests, 2)
 			require.Equal(t, virtv1.StopRequest, newKVVM.Status.StateChangeRequests[0].Action)
 			require.NotNil(t, newKVVM.Status.StateChangeRequests[0].UID)
-			require.Equal(t, uid, *newKVVM.Status.StateChangeRequests[0].UID)
+			require.Equal(t, kvvmiUID, *newKVVM.Status.StateChangeRequests[0].UID)
 			require.Equal(t, virtv1.StartRequest, newKVVM.Status.StateChangeRequests[1].Action)
 
 			pod := &corev1.Pod{}