++ hide new liveMigration settings in ModuleConfig until more thorough research

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

Author: diafour

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

@@ -19,6 +19,7 @@ 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"
@@ -57,6 +58,18 @@ func (h *DynamicSettingsHandler) Handle(ctx context.Context, kvvmi *virtv1.Virtu
 		return reconcile.Result{}, err
 	}
 
+	// TODO Temporary fix to have liveMigration settings in one place.
+	// TODO Remove after implementing liveMigration settings.
+	var kvconfig virtv1.KubeVirt
+	configKey := types.NamespacedName{
+		Namespace: "d8-virtualization",
+		Name:      "config",
+	}
+	err = h.client.Get(ctx, configKey, &kvconfig)
+	if err != nil {
+		return reconcile.Result{}, err
+	}
+
 	// Fetch InProgress vmop
 	vmopInProgress, err := h.getVMOPInProgressForVM(ctx, vmKey)
 	if err != nil {
@@ -68,7 +81,7 @@ func (h *DynamicSettingsHandler) Handle(ctx context.Context, kvvmi *virtv1.Virtu
 		return reconcile.Result{}, err
 	}
 
-	conf := livemigration.NewMigrationConfiguration(h.moduleSettings, autoConverge)
+	conf := livemigration.NewMigrationConfiguration(h.moduleSettings, autoConverge, kvconfig)
 
 	kvvmi.Status.MigrationState.MigrationConfiguration = conf
 

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

@@ -37,21 +37,35 @@ const (
 	MigrationAllowPostCopy              bool   = false
 )
 
-func NewMigrationConfiguration(moduleSettings config.LiveMigrationSettings, allowAutoConverge bool) *virtv1.MigrationConfiguration {
-	parallelMigrationsPerClusterDefault := ParallelMigrationsPerClusterDefault
+func NewMigrationConfiguration(moduleSettings config.LiveMigrationSettings, 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.ParallelMigrationsPerCluster != nil {
+		parallelMigrationsPerCluster = *kvconfig.Spec.Configuration.MigrationConfiguration.ParallelMigrationsPerCluster
+	}
+	// Reuse default value of MaxMigrationsPerNode as parallelOutboundMigrationsPerNode.
 	parallelOutboundMigrationsPerNode := uint32(moduleSettings.MaxMigrationsPerNode)
+	if kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode != nil {
+		parallelOutboundMigrationsPerNode = *kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode
+	}
+	// Reuse default value of BandwidthPerNode as bandwidthPerMigration.
+	bandwidthPerMigration := moduleSettings.BandwidthPerNode.DeepCopy()
+	if kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration != nil {
+		bandwidthPerMigration = kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration.DeepCopy()
+	}
+
+	// Just use defaults from KubeVirt.
 	nodeDrainTaintDefaultKey := NodeDrainTaintDefaultKey
-	bandwidthPerMigrationDefault := moduleSettings.BandwidthPerNode.DeepCopy()
 	progressTimeout := MigrationProgressTimeout
 	completionTimeoutPerGiB := MigrationCompletionTimeoutPerGiB
 	defaultUnsafeMigrationOverride := DefaultUnsafeMigrationOverride
 	allowPostCopy := MigrationAllowPostCopy
 
 	return &virtv1.MigrationConfiguration{
-		ParallelMigrationsPerCluster:      &parallelMigrationsPerClusterDefault,
+		ParallelMigrationsPerCluster:      &parallelMigrationsPerCluster,
 		ParallelOutboundMigrationsPerNode: &parallelOutboundMigrationsPerNode,
 		NodeDrainTaintKey:                 &nodeDrainTaintDefaultKey,
-		BandwidthPerMigration:             &bandwidthPerMigrationDefault,
+		BandwidthPerMigration:             &bandwidthPerMigration,
 		ProgressTimeout:                   &progressTimeout,
 		CompletionTimeoutPerGiB:           &completionTimeoutPerGiB,
 		UnsafeMigrationOverride:           &defaultUnsafeMigrationOverride,

openapi/config-values.yaml

@@ -223,41 +223,6 @@ properties:
             items:
               type: string
             x-examples: ["sc-1", "sc-2"]
-  liveMigration:
-    type: object
-    description: |
-      Live migration settings.
-    properties:
-      bandwidthPerNode:
-        type: string
-        pattern: "^[1-9][0-9]+([kMGTP]i)?$"
-        description: |
-          Maximum aggregated network bandwidth for migrations from one Node.
-      maxMigrationsPerNode:
-        type: integer
-        description: |
-          Maximum number of simultaneous migrations from one Node.
-      network:
-        type: string
-        description: |
-          Network type for migrations:
-          - `Shared` — use the same network with virtual machines.
-          - `Dedicated` — use a separated network for migrations. Specify interface in `dedicated` section.
-        enum:
-          - "Shared"
-          - "Dedicated"
-      dedicated:
-        type: object
-        description: |
-          Settings for the dedicated network.
-        properties:
-          interfaceName:
-            type: string
-            x-examples:
-              - "eth0"
-              - "veth2"
-            description: |
-              Interface name for the dedicated network.
   logLevel:
     type: string
     description: |

openapi/doc-ru-config-values.yaml

@@ -132,34 +132,6 @@ properties:
             type: array
             items:
               type: string
-  liveMigration:
-    type: object
-    description: |
-      Настройки живой миграции.
-    properties:
-      bandwidthPerNode:
-        type: string
-        description: |
-          Максимальная ширина полосы пропускания сети на узле в процессе миграции.
-      maxMigrationsPerNode:
-        type: integer
-        description: |
-          Максимальное количество одновременно запущенных миграций на узле.
-      network:
-        type: string
-        description: |
-          Тип сети для миграции:
-          - `Shared` — использовать ту же сеть, которая выделена для виртуальных машин.
-          - `Dedicated` — использовать выделенную сеть для миграций. Укажите имя интерфейса в поле `dedicated`.
-      dedicated:
-        type: object
-        description: |
-          Настройки выделенной сети для миграций.
-        properties:
-          interfaceName:
-            type: string
-            description: |
-              Имя интерфейса выделенной сети.
   logLevel:
     type: string
     description: |