++ suggestions from review

Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>

Author: diafour

images/virtualization-artifact/cmd/virtualization-controller/main.go

@@ -352,7 +352,7 @@ func main() {
 	}
 
 	liveMigrationLogger := logger.NewControllerLogger(livemigration.ControllerName, logLevel, logOutput, logDebugVerbosity, logDebugControllerList)
-	if err = livemigration.NewController(ctx, mgr, liveMigrationLogger, liveMigrationSettings); err != nil {
+	if err = livemigration.SetupController(ctx, mgr, liveMigrationLogger, liveMigrationSettings); err != nil {
 		log.Error(err.Error())
 		os.Exit(1)
 	}

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

@@ -17,8 +17,6 @@ limitations under the License.
 package vmop
 
 import (
-	"k8s.io/utils/ptr"
-
 	"github.com/deckhouse/virtualization-controller/pkg/builder/meta"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
@@ -48,14 +46,8 @@ func WithVirtualMachine(vm string) Option {
 	}
 }
 
-func WithForce() Option {
-	return func(vmop *v1alpha2.VirtualMachineOperation) {
-		vmop.Spec.Force = ptr.To(true)
-	}
-}
-
-func WithForceFalse() Option {
+func WithForce(force *bool) Option {
 	return func(vmop *v1alpha2.VirtualMachineOperation) {
-		vmop.Spec.Force = ptr.To(false)
+		vmop.Spec.Force = force
 	}
 }

images/virtualization-artifact/pkg/controller/livemigration/internal/dynamic_settings_handler.go

@@ -19,7 +19,6 @@ package internal
 import (
 	"context"
 
-	"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"
@@ -52,17 +51,14 @@ func (h *DynamicSettingsHandler) Handle(ctx context.Context, kvvmi *virtv1.Virtu
 	}
 
 	var vm v1alpha2.VirtualMachine
-	vmKey := types.NamespacedName{
-		Namespace: kvvmi.Namespace,
-		Name:      kvvmi.Name,
-	}
+	vmKey := client.ObjectKeyFromObject(kvvmi)
 	err := h.client.Get(ctx, vmKey, &vm)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
 
 	// Fetch InProgress vmop
-	vmopInProgress, err := h.GetVMOPInProgressForVM(ctx, vmKey)
+	vmopInProgress, err := h.getVMOPInProgressForVM(ctx, vmKey)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
@@ -98,8 +94,8 @@ func (h *DynamicSettingsHandler) shouldUpdateMigrationConfiguration(kvvmi *virtv
 		!kvvmi.Status.MigrationState.Completed
 }
 
-// GetVMOPInProgressForVM check if there is at least one VMOP for the same VM in progress phase.
-func (h *DynamicSettingsHandler) GetVMOPInProgressForVM(ctx context.Context, vmKey client.ObjectKey) (*v1alpha2.VirtualMachineOperation, error) {
+// getVMOPInProgressForVM check if there is at least one VMOP for the same VM in progress phase.
+func (h *DynamicSettingsHandler) getVMOPInProgressForVM(ctx context.Context, vmKey client.ObjectKey) (*v1alpha2.VirtualMachineOperation, error) {
 	var vmopList v1alpha2.VirtualMachineOperationList
 	err := h.client.List(ctx, &vmopList, client.InNamespace(vmKey.Namespace))
 	if err != nil {

images/virtualization-artifact/pkg/controller/livemigration/internal/dynamic_settings_handler_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
-var _ = Describe("TestEvacuationHandler", func() {
+var _ = Describe("TestDynamicSettingsHandler", func() {
 	const (
 		vmName      = "vm-migratable"
 		vmNamespace = "default"

images/virtualization-artifact/pkg/controller/livemigration/live_migration_controller.go

@@ -34,7 +34,7 @@ const (
 	ControllerName = "live-migration-controller"
 )
 
-func NewController(
+func SetupController(
 	ctx context.Context,
 	mgr manager.Manager,
 	log *log.Logger,

images/virtualization-artifact/pkg/controller/vmop/internal/lifecycle_test.go

@@ -21,6 +21,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	vmbuilder "github.com/deckhouse/virtualization-controller/pkg/builder/vm"
@@ -90,12 +91,12 @@ var _ = Describe("LifecycleHandler", func() {
 			virtv2.VMOPPhasePending,
 		),
 		Entry("is ok for AlwaysSafe and force=false",
-			newVMOPEvictPending(vmopbuilder.WithForceFalse()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(false))),
 			virtv2.AlwaysSafeMigrationPolicy,
 			virtv2.VMOPPhasePending,
 		),
 		Entry("should become Failed for AlwaysSafe and force=true",
-			newVMOPEvictPending(vmopbuilder.WithForce()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(true))),
 			virtv2.AlwaysSafeMigrationPolicy,
 			virtv2.VMOPPhaseFailed,
 		),
@@ -107,12 +108,12 @@ var _ = Describe("LifecycleHandler", func() {
 			virtv2.VMOPPhasePending,
 		),
 		Entry("is ok for PreferSafe and force=false",
-			newVMOPEvictPending(vmopbuilder.WithForceFalse()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(false))),
 			virtv2.PreferSafeMigrationPolicy,
 			virtv2.VMOPPhasePending,
 		),
 		Entry("is ok for PreferSafe and force=true",
-			newVMOPEvictPending(vmopbuilder.WithForce()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(true))),
 			virtv2.PreferSafeMigrationPolicy,
 			virtv2.VMOPPhasePending,
 		),
@@ -124,12 +125,12 @@ var _ = Describe("LifecycleHandler", func() {
 			virtv2.VMOPPhasePending,
 		),
 		Entry("should become Failed for AlwaysForced and force=false",
-			newVMOPEvictPending(vmopbuilder.WithForceFalse()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(false))),
 			virtv2.AlwaysForcedMigrationPolicy,
 			virtv2.VMOPPhaseFailed,
 		),
 		Entry("is ok for AlwaysForced and force=true",
-			newVMOPEvictPending(vmopbuilder.WithForce()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(true))),
 			virtv2.AlwaysForcedMigrationPolicy,
 			virtv2.VMOPPhasePending,
 		),
@@ -141,12 +142,12 @@ var _ = Describe("LifecycleHandler", func() {
 			virtv2.VMOPPhasePending,
 		),
 		Entry("is ok for PreferForced and force=false",
-			newVMOPEvictPending(vmopbuilder.WithForceFalse()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(false))),
 			virtv2.PreferForcedMigrationPolicy,
 			virtv2.VMOPPhasePending,
 		),
 		Entry("is ok for PreferForced and force=true",
-			newVMOPEvictPending(vmopbuilder.WithForce()),
+			newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(true))),
 			virtv2.PreferForcedMigrationPolicy,
 			virtv2.VMOPPhasePending,
 		),