++ remove LiveMigrationSettings struct and its boilerplate.

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

Author: diafour

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

@@ -164,12 +164,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	liveMigrationSettings, err := appconfig.LoadLiveMigrationSettings()
-	if err != nil {
-		log.Error(err.Error())
-		os.Exit(1)
-	}
-
 	viStorageClassSettings := appconfig.LoadVirtualImageStorageClassSettings()
 	vdStorageClassSettings := appconfig.LoadVirtualDiskStorageClassSettings()
 
@@ -352,7 +346,7 @@ func main() {
 	}
 
 	liveMigrationLogger := logger.NewControllerLogger(livemigration.ControllerName, logLevel, logOutput, logDebugVerbosity, logDebugControllerList)
-	if err = livemigration.SetupController(ctx, mgr, liveMigrationLogger, liveMigrationSettings); err != nil {
+	if err = livemigration.SetupController(ctx, mgr, liveMigrationLogger); err != nil {
 		log.Error(err.Error())
 		os.Exit(1)
 	}

images/virtualization-artifact/pkg/config/load_live_migration_settings.go

@@ -17,95 +17,11 @@ limitations under the License.
 package config
 
 import (
-	"fmt"
-	"os"
-	"strconv"
-
-	"k8s.io/apimachinery/pkg/api/resource"
-
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
-const (
-	LiveMigrationBandwidthPerNodeEnv       = "LIVE_MIGRATION_BANDWIDTH_PER_NODE"
-	LiveMigrationMaxMigrationsPerNodeEnv   = "LIVE_MIGRATION_MAX_MIGRATIONS_PER_NODE"
-	LiveMigrationNetworkEnv                = "LIVE_MIGRATION_NETWORK"
-	LiveMigrationDedicatedInterfaceNameEnv = "LIVE_MIGRATION_DEDICATED_INTERFACE_NAME"
-)
-
-type LiveMigrationNetwork string
+// TODO(future) live migration settings will be here. Now just a place for the default policy.
 
-// These constants should be in sync with liveMigration.network field enum in config-values.yaml
 const (
-	LiveMigrationNetworkShared    LiveMigrationNetwork = "Shared"
-	LiveMigrationNetworkDedicated LiveMigrationNetwork = "Dedicated"
+	DefaultLiveMigrationPolicy = v1alpha2.PreferSafeMigrationPolicy
 )
-
-const (
-	DefaultBandwidthPerNode     = "64Mi"
-	DefaultMaxMigrationsPerNode = 2
-	DefaultNetwork              = LiveMigrationNetworkShared
-	DefaultLiveMigrationPolicy  = v1alpha2.PreferSafeMigrationPolicy
-)
-
-type LiveMigrationSettings struct {
-	BandwidthPerNode       resource.Quantity
-	MaxMigrationsPerNode   int
-	Network                LiveMigrationNetwork
-	DedicatedInterfaceName string
-}
-
-func LoadLiveMigrationSettings() (LiveMigrationSettings, error) {
-	settings := NewDefaultLiveMigrationSettings()
-
-	if val, ok := os.LookupEnv(LiveMigrationBandwidthPerNodeEnv); ok && val != "" {
-		bandwidth, err := resource.ParseQuantity(val)
-		if err != nil {
-			return settings, fmt.Errorf("parse %s: %s should be bandwidth quantity: %w", LiveMigrationBandwidthPerNodeEnv, val, err)
-		}
-		settings.BandwidthPerNode = bandwidth
-	}
-
-	if val, ok := os.LookupEnv(LiveMigrationMaxMigrationsPerNodeEnv); ok && val != "" {
-		maxPerNode, err := strconv.ParseUint(val, 10, 32)
-		if err != nil {
-			return settings, fmt.Errorf("parse %s: %s should be numberic value: %w", LiveMigrationMaxMigrationsPerNodeEnv, val, err)
-		}
-		settings.MaxMigrationsPerNode = int(maxPerNode)
-	}
-
-	if val, ok := os.LookupEnv(LiveMigrationNetworkEnv); ok && val != "" {
-		switch val {
-		case string(LiveMigrationNetworkShared):
-			settings.Network = LiveMigrationNetworkShared
-		case string(LiveMigrationNetworkDedicated):
-			settings.Network = LiveMigrationNetworkDedicated
-		default:
-			return settings, fmt.Errorf("parse %s: %s is unsupported value, should be one of [%s, %s]",
-				LiveMigrationNetworkEnv, val,
-				LiveMigrationNetworkShared, LiveMigrationNetworkDedicated,
-			)
-		}
-	}
-
-	if val, ok := os.LookupEnv(LiveMigrationDedicatedInterfaceNameEnv); ok && val != "" {
-		settings.DedicatedInterfaceName = val
-	}
-
-	return settings, nil
-}
-
-// defaultBandwidthPerNode is an error eater for hardcoded quantity.
-// Parsing of DefaultBandwidthPerNode should be tested.
-func defaultBandwidthPerNode() resource.Quantity {
-	bandwidth, _ := resource.ParseQuantity(DefaultBandwidthPerNode)
-	return bandwidth
-}
-
-func NewDefaultLiveMigrationSettings() LiveMigrationSettings {
-	return LiveMigrationSettings{
-		BandwidthPerNode:     defaultBandwidthPerNode(),
-		MaxMigrationsPerNode: DefaultMaxMigrationsPerNode,
-		Network:              DefaultNetwork,
-	}
-}

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

@@ -24,24 +24,21 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/deckhouse/virtualization-controller/pkg/config"
 	"github.com/deckhouse/virtualization-controller/pkg/livemigration"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 const dynamicSettingsHandlerName = "DynamicSettingsHandler"
 
-func NewDynamicSettingsHandler(client client.Client, liveMigrationSettings config.LiveMigrationSettings) *DynamicSettingsHandler {
+func NewDynamicSettingsHandler(client client.Client) *DynamicSettingsHandler {
 	return &DynamicSettingsHandler{
-		client:         client,
-		moduleSettings: liveMigrationSettings,
+		client: client,
 	}
 }
 
 type DynamicSettingsHandler struct {
-	client         client.Client
-	moduleSettings config.LiveMigrationSettings
+	client client.Client
 }
 
 func (h *DynamicSettingsHandler) Handle(ctx context.Context, kvvmi *virtv1.VirtualMachineInstance) (reconcile.Result, error) {
@@ -82,7 +79,7 @@ func (h *DynamicSettingsHandler) Handle(ctx context.Context, kvvmi *virtv1.Virtu
 		return reconcile.Result{}, err
 	}
 
-	conf := livemigration.NewMigrationConfiguration(h.moduleSettings, autoConverge, kvconfig)
+	conf := livemigration.NewMigrationConfiguration(autoConverge, kvconfig)
 
 	kvvmi.Status.MigrationState.MigrationConfiguration = conf
 

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

@@ -25,7 +25,6 @@ import (
 
 	vmbuilder "github.com/deckhouse/virtualization-controller/pkg/builder/vm"
 	"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
-	"github.com/deckhouse/virtualization-controller/pkg/config"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
@@ -103,7 +102,7 @@ var _ = Describe("TestDynamicSettingsHandler", func() {
 			kvvmi.Status.MigrationState = &virtv1.VirtualMachineInstanceMigrationState{}
 
 			fakeClient := setupEnvironment(kvvmi, vm, newKVConfig())
-			h := NewDynamicSettingsHandler(fakeClient, config.NewDefaultLiveMigrationSettings())
+			h := NewDynamicSettingsHandler(fakeClient)
 			_, err := h.Handle(ctx, kvvmi)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -121,7 +120,7 @@ var _ = Describe("TestDynamicSettingsHandler", func() {
 			}
 
 			fakeClient := setupEnvironment(kvvmi, vm, newKVConfig())
-			h := NewDynamicSettingsHandler(fakeClient, config.NewDefaultLiveMigrationSettings())
+			h := NewDynamicSettingsHandler(fakeClient)
 			_, err := h.Handle(ctx, kvvmi)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -140,7 +139,7 @@ var _ = Describe("TestDynamicSettingsHandler", func() {
 			vmop := newVMOPEvict(force)
 
 			fakeClient := setupEnvironment(kvvmi, vm, vmop, newKVConfig())
-			h := NewDynamicSettingsHandler(fakeClient, config.NewDefaultLiveMigrationSettings())
+			h := NewDynamicSettingsHandler(fakeClient)
 			_, err := h.Handle(ctx, kvvmi)
 			Expect(err).NotTo(HaveOccurred())
 

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

@@ -25,7 +25,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
-	"github.com/deckhouse/virtualization-controller/pkg/config"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/livemigration/internal"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 )
@@ -38,12 +37,11 @@ func SetupController(
 	ctx context.Context,
 	mgr manager.Manager,
 	log *log.Logger,
-	liveMigrationSettings config.LiveMigrationSettings,
 ) error {
 	client := mgr.GetClient()
 
 	handlers := []Handler{
-		internal.NewDynamicSettingsHandler(client, liveMigrationSettings),
+		internal.NewDynamicSettingsHandler(client),
 	}
 	r := NewReconciler(client, handlers...)
 

images/virtualization-artifact/pkg/livemigration/migration_configuration.go

@@ -21,35 +21,36 @@ import (
 	"fmt"
 	"reflect"
 
+	"k8s.io/apimachinery/pkg/api/resource"
 	virtv1 "kubevirt.io/api/core/v1"
-
-	"github.com/deckhouse/virtualization-controller/pkg/config"
 )
 
 // Live migration defaults from kubevirt
 
 const (
-	ParallelMigrationsPerClusterDefault uint32 = 5
-	NodeDrainTaintDefaultKey            string = "kubevirt.io/drain"
-	MigrationProgressTimeout            int64  = 150
-	MigrationCompletionTimeoutPerGiB    int64  = 800
-	DefaultUnsafeMigrationOverride      bool   = false
-	MigrationAllowPostCopy              bool   = false
+	ParallelOutboundMigrationsPerNodeDefault uint32 = 2
+	ParallelMigrationsPerClusterDefault      uint32 = 5
+	BandwidthPerMigrationDefault                    = "0Mi"
+	NodeDrainTaintDefaultKey                 string = "kubevirt.io/drain"
+	MigrationProgressTimeout                 int64  = 150
+	MigrationCompletionTimeoutPerGiB         int64  = 800
+	DefaultUnsafeMigrationOverride           bool   = false
+	MigrationAllowPostCopy                   bool   = false
 )
 
-func NewMigrationConfiguration(moduleSettings config.LiveMigrationSettings, allowAutoConverge bool, kvconfig virtv1.KubeVirt) *virtv1.MigrationConfiguration {
+func NewMigrationConfiguration(allowAutoConverge bool, kvconfig virtv1.KubeVirt) *virtv1.MigrationConfiguration {
 	// TODO rework below section after proper implementation of liveMigration settings in ModuleConfig.
 	parallelMigrationsPerCluster := ParallelMigrationsPerClusterDefault
 	if kvconfig.Spec.Configuration.MigrationConfiguration != nil && kvconfig.Spec.Configuration.MigrationConfiguration.ParallelMigrationsPerCluster != nil {
 		parallelMigrationsPerCluster = *kvconfig.Spec.Configuration.MigrationConfiguration.ParallelMigrationsPerCluster
 	}
 	// Reuse default value of MaxMigrationsPerNode as parallelOutboundMigrationsPerNode.
-	parallelOutboundMigrationsPerNode := uint32(moduleSettings.MaxMigrationsPerNode)
+	parallelOutboundMigrationsPerNode := ParallelOutboundMigrationsPerNodeDefault
 	if kvconfig.Spec.Configuration.MigrationConfiguration != nil && kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode != nil {
 		parallelOutboundMigrationsPerNode = *kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode
 	}
 	// Reuse default value of BandwidthPerNode as bandwidthPerMigration.
-	bandwidthPerMigration := moduleSettings.BandwidthPerNode.DeepCopy()
+	bandwidthPerMigration := resource.MustParse(BandwidthPerMigrationDefault)
 	if kvconfig.Spec.Configuration.MigrationConfiguration != nil && kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration != nil {
 		bandwidthPerMigration = kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration.DeepCopy()
 	}