++ linter

++ cleanup additional logging

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

Author: diafour

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

@@ -259,24 +259,16 @@ func (h *SyncKvvmHandler) isWaiting(vm *v1alpha2.VirtualMachine) bool {
 }
 
 func (h *SyncKvvmHandler) syncKVVM(ctx context.Context, s state.VirtualMachineState, allChanges vmchange.SpecChanges) (bool, error) {
-	log := logger.FromContext(ctx)
-
-	log.Info("syncKVVM: start")
 	if s.VirtualMachine().IsEmpty() {
-		log.Info("syncKVVM: got empty VM, return")
 		return false, fmt.Errorf("the virtual machine is empty, please report a bug")
 	}
 
-	log.Info("syncKVVM: vm non-empty")
-
 	kvvm, err := s.KVVM(ctx)
 	if err != nil {
 		return false, fmt.Errorf("find the internal virtual machine: %w", err)
 	}
 
 	if kvvm == nil {
-		log.Info("syncKVVM: got empty KVVM, create a new one")
-
 		err = h.createKVVM(ctx, s)
 		if err != nil {
 			return false, fmt.Errorf("create the internal virtual machine: %w", err)
@@ -285,8 +277,6 @@ func (h *SyncKvvmHandler) syncKVVM(ctx context.Context, s state.VirtualMachineSt
 		return true, nil
 	}
 
-	log.Info("syncKVVM: got non-empty KVVM, synchronize")
-
 	kvvmi, err := s.KVVMI(ctx)
 	if err != nil {
 		return false, fmt.Errorf("find the internal virtual machine instance: %w", err)
@@ -301,8 +291,6 @@ func (h *SyncKvvmHandler) syncKVVM(ctx context.Context, s state.VirtualMachineSt
 	// When a KVVM is created with conflicting placement rules and cannot be scheduled,
 	// it remains unschedulable even if these rules are changed or removed.
 	case h.isVMUnschedulable(s.VirtualMachine().Current(), kvvm) && h.isPlacementPolicyChanged(allChanges):
-		log.Info("syncKVVM: detect KVVM is Unschedulable, update KVVM")
-
 		err := h.updateKVVM(ctx, s)
 		if err != nil {
 			return false, fmt.Errorf("failed to update internal virtual machine: %w", err)
@@ -313,8 +301,6 @@ func (h *SyncKvvmHandler) syncKVVM(ctx context.Context, s state.VirtualMachineSt
 		}
 		return true, nil
 	case h.isVMStopped(s.VirtualMachine().Current(), kvvm, pod):
-		log.Info("syncKVVM: detect KVVM is Stopped, update KVVM")
-
 		// KVVM should be updated when VM become stopped.
 		// It is safe to update KVVM at this point in general and also all related resources
 		// can be changed during the restoration process: e.g. VirtualDisks, VMIPs, etc.
@@ -326,8 +312,6 @@ func (h *SyncKvvmHandler) syncKVVM(ctx context.Context, s state.VirtualMachineSt
 		}
 		return true, nil
 	case h.hasNoneDisruptiveChanges(s.VirtualMachine().Current(), kvvm, kvvmi, allChanges):
-		log.Info("syncKVVM: detect no disruptive changes, apply them to KVVM")
-
 		// No need to wait, apply changes to KVVM immediately.
 		err = h.applyVMChangesToKVVM(ctx, s, allChanges)
 		if err != nil {
@@ -336,11 +320,8 @@ func (h *SyncKvvmHandler) syncKVVM(ctx context.Context, s state.VirtualMachineSt
 
 		return true, nil
 	case allChanges.IsEmpty():
-		log.Info("syncKVVM: detect no changes, stop sync")
-
 		return true, nil
 	default:
-		log.Info("syncKVVM: detect disruptive changes: wait for reboot")
 		// Delay changes propagation to KVVM until user restarts VM.
 		return false, nil
 	}

images/virtualization-artifact/pkg/controller/workload-updater/workload_updater_controller.go

@@ -20,14 +20,14 @@ import (
 	"context"
 	"time"
 
-	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/workload-updater/internal/handler"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/workload-updater/internal/service"
+	"github.com/deckhouse/virtualization-controller/pkg/featuregates"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 )