fix(vm): fix stopping a VM with unapplied changes (#991)

Signed-off-by: Dmitry Lopatin <dmitry.lopatin@flant.com>

Author: LopatinDmitr

images/virtualization-artifact/pkg/controller/vm/internal/sync_kvvm.go

@@ -33,7 +33,6 @@ import (
 	vmutil "github.com/deckhouse/virtualization-controller/pkg/common/vm"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/kvbuilder"
-	"github.com/deckhouse/virtualization-controller/pkg/controller/powerstate"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vm/internal/state"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmchange"
@@ -495,7 +494,7 @@ func (h *SyncKvvmHandler) canApplyChanges(
 	if vm == nil || changes.IsEmpty() {
 		return false
 	}
-	if vmutil.ApprovalMode(vm) == virtv2.Automatic || !changes.IsDisruptive() || kvvmi == nil {
+	if !changes.IsDisruptive() || kvvmi == nil {
 		return true
 	}
 
@@ -537,23 +536,10 @@ func (h *SyncKvvmHandler) applyVMChangesToKVVM(ctx context.Context, s state.Virt
 
 	switch action {
 	case vmchange.ActionRestart:
-		h.recorder.WithLogging(log).Event(current, corev1.EventTypeNormal, virtv2.ReasonVMChangesApplied, "Apply disruptive changes with restart")
-		h.recorder.WithLogging(log).Event(
-			current,
-			corev1.EventTypeNormal,
-			virtv2.ReasonVMRestarted,
-			"Restart initiated by controller to apply changes",
-		)
-
 		// Update KVVM spec according the current VM spec.
 		if err = h.updateKVVM(ctx, s); err != nil {
 			return fmt.Errorf("update virtual machine instance with new spec: %w", err)
 		}
-		// Ask kubevirt to re-create KVVMI to apply new spec from KVVM.
-		err = powerstate.RestartVM(ctx, h.client, kvvm, kvvmi, false)
-		if err != nil {
-			return fmt.Errorf("restart virtual machine instance to apply changes: %w", err)
-		}
 
 	case vmchange.ActionApplyImmediate:
 		message := "Apply changes without restart"

images/virtualization-artifact/pkg/controller/vm/internal/sync_power_state.go

@@ -151,6 +151,27 @@ func (h *SyncPowerStateHandler) syncPowerState(
 
 	switch vmAction {
 	case Nothing:
+		vm := s.VirtualMachine().Changed()
+		cbAwaitingRestart, exist := conditions.GetCondition(vmcondition.TypeAwaitingRestartToApplyConfiguration, vm.Status.Conditions)
+		if exist && cbAwaitingRestart.Status == metav1.ConditionTrue &&
+			cbAwaitingRestart.ObservedGeneration == vm.GetGeneration() &&
+			vm.Spec.Disruptions.RestartApprovalMode == virtv2.Automatic {
+
+			log := logger.FromContext(ctx)
+			h.recorder.WithLogging(log).Event(vm, corev1.EventTypeNormal, virtv2.ReasonVMChangesApplied, "Apply disruptive changes with restart")
+			h.recorder.WithLogging(log).Event(
+				vm,
+				corev1.EventTypeNormal,
+				virtv2.ReasonVMRestarted,
+				"Restart initiated by controller to apply changes",
+			)
+			err = powerstate.RestartVM(ctx, h.client, kvvm, kvvmi, false)
+			if err != nil {
+				return fmt.Errorf("restart virtual machine instance to apply changes: %w", err)
+			}
+			return nil
+		}
+
 		return nil
 	case Start:
 		return h.start(ctx, s, kvvm, isConfigurationApplied)

tests/e2e/vm_configuration_test.go

@@ -106,7 +106,7 @@ func CheckCPUCoresNumber(approvalMode, stage string, requiredValue int, virtualM
 		case approvalMode == ManualMode && stage == StageAfter:
 			Expect(vmResource.Status.RestartAwaitingChanges).ShouldNot(BeNil())
 		case approvalMode == AutomaticMode && stage == StageAfter:
-			Expect(vmResource.Status.RestartAwaitingChanges).Should(BeNil())
+			Expect(vmResource.Status.RestartAwaitingChanges).ShouldNot(BeNil())
 		}
 	}
 }