++

Signed-off-by: dmitry.lopatin <[email protected]>
deckhouse · Dec 13, 2024 · faa5d8d · faa5d8d
1 parent 01d4cb6
commit faa5d8d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 48 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go
@@ -128,15 +128,10 @@ func (b *KVVM) SetCPUModel(class *virtv2.VirtualMachineClass) error {
 
 func (b *KVVM) SetRunPolicy(runPolicy virtv2.RunPolicy) error {
 	switch runPolicy {
-	case virtv2.AlwaysOnPolicy:
-		b.Resource.Spec.RunStrategy = pointer.GetPointer(virtv1.RunStrategyAlways)
-	case virtv2.AlwaysOffPolicy:
-		b.Resource.Spec.RunStrategy = pointer.GetPointer(virtv1.RunStrategyHalted)
-	case virtv2.ManualPolicy:
-		if !b.ResourceExists {
-			// initialize only
-			b.Resource.Spec.RunStrategy = pointer.GetPointer(virtv1.RunStrategyManual)
-		}
+	case virtv2.AlwaysOnPolicy,
+		virtv2.AlwaysOffPolicy,
+		virtv2.ManualPolicy:
+		b.Resource.Spec.RunStrategy = pointer.GetPointer(virtv1.RunStrategyManual)
 	case virtv2.AlwaysOnUnlessStoppedManually:
 		if !b.ResourceExists {
 			// initialize only

diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/sync_power_state.go b/images/virtualization-artifact/pkg/controller/vm/internal/sync_power_state.go
@@ -20,72 +20,48 @@ import (
 	"context"
 	"fmt"
 
-	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/record"
 	virtv1 "kubevirt.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	kvvmutil "github.com/deckhouse/virtualization-controller/pkg/common/kvvm"
-	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"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/logger"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
-	"github.com/deckhouse/virtualization/api/core/v1alpha2/vmcondition"
 )
 
 const nameSyncPowerStateHandler = "SyncPowerStateHandler"
 
-func NewSyncPowerStateHandler(client client.Client, recorder record.EventRecorder) *SyncPowerStateHandler {
+func NewSyncPowerStateHandler(client client.Client) *SyncPowerStateHandler {
 	return &SyncPowerStateHandler{
-		client:   client,
-		recorder: recorder,
+		client: client,
 	}
 }
 
 type SyncPowerStateHandler struct {
-	client   client.Client
-	recorder record.EventRecorder
+	client client.Client
 }
 
 func (h *SyncPowerStateHandler) Handle(ctx context.Context, s state.VirtualMachineState) (reconcile.Result, error) {
+	log, ctx := logger.GetHandlerContext(ctx, nameSyncPowerStateHandler)
+
 	if s.VirtualMachine().IsEmpty() {
 		return reconcile.Result{}, nil
 	}
 
-	current := s.VirtualMachine().Current()
 	changed := s.VirtualMachine().Changed()
 
-	cbConfApplied := conditions.NewConditionBuilder(vmcondition.TypeConfigurationApplied).
-		Generation(current.GetGeneration()).
-		Status(metav1.ConditionUnknown).
-		Reason(conditions.ReasonUnknown)
-
-	defer func() {
-		conditions.SetCondition(cbConfApplied, &changed.Status.Conditions)
-	}()
-
 	kvvm, err := s.KVVM(ctx)
 	if err != nil {
-		cbConfApplied.
-			Status(metav1.ConditionFalse).
-			Reason(vmcondition.ReasonConfigurationNotApplied).
-			Message(service.CapitalizeFirstLetter(err.Error()) + ".")
-		return reconcile.Result{}, err
+		return reconcile.Result{}, fmt.Errorf("find the internal virtual machine: %w", err)
 	}
 
 	err = h.syncPowerState(ctx, s, kvvm, &changed.Spec)
 	if err != nil {
 		err = fmt.Errorf("failed to sync powerstate: %w", err)
-		h.recorder.Event(current, corev1.EventTypeWarning, virtv2.ReasonErrVmNotSynced, err.Error())
-		cbConfApplied.
-			Status(metav1.ConditionFalse).
-			Reason(vmcondition.ReasonConfigurationNotApplied).
-			Message(service.CapitalizeFirstLetter(err.Error()) + ".")
+		log.Error(err.Error())
 	}
 
 	return reconcile.Result{}, err
@@ -119,10 +95,8 @@ func (h *SyncPowerStateHandler) syncPowerState(ctx context.Context, s state.Virt
 				return fmt.Errorf("force AlwaysOff: delete KVVMI: %w", err)
 			}
 		}
-		err = h.ensureRunStrategy(ctx, kvvm, virtv1.RunStrategyHalted)
 	case virtv2.AlwaysOnPolicy:
-		strategy, _ := kvvm.RunStrategy()
-		if strategy == virtv1.RunStrategyAlways && kvvmi == nil {
+		if kvvmi == nil {
 			if err = powerstate.StartVM(ctx, h.client, kvvm); err != nil {
 				return fmt.Errorf("failed to start VM: %w", err)
 			}
@@ -145,8 +119,6 @@ func (h *SyncPowerStateHandler) syncPowerState(ctx context.Context, s state.Virt
 				}
 			}
 		}
-
-		err = h.ensureRunStrategy(ctx, kvvm, virtv1.RunStrategyManual)
 	case virtv2.AlwaysOnUnlessStoppedManually:
 		strategy, _ := kvvm.RunStrategy()
 		if strategy == virtv1.RunStrategyAlways && kvvmi == nil {
@@ -207,8 +179,6 @@ func (h *SyncPowerStateHandler) syncPowerState(ctx context.Context, s state.Virt
 				}
 			}
 		}
-
-		err = h.ensureRunStrategy(ctx, kvvm, virtv1.RunStrategyManual)
 	}
 
 	if err != nil {

diff --git a/images/virtualization-artifact/pkg/controller/vm/vm_controller.go b/images/virtualization-artifact/pkg/controller/vm/vm_controller.go
@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/deckhouse/virtualization-controller/pkg/controller/ipam"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vm/internal"
@@ -63,7 +64,7 @@ func SetupController(
 		internal.NewPodHandler(client),
 		internal.NewSizePolicyHandler(),
 		internal.NewSyncKvvmHandler(dvcrSettings, client, recorder),
-		internal.NewSyncPowerStateHandler(client, recorder),
+		internal.NewSyncPowerStateHandler(client),
 		internal.NewSyncMetadataHandler(client),
 		internal.NewLifeCycleHandler(client, recorder),
 		internal.NewStatisticHandler(client),