fix

Signed-off-by: Yaroslav Borbat <[email protected]>

images/virtualization-artifact/pkg/migration/migration.go

@@ -24,6 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 )
 
@@ -35,49 +36,37 @@ var newMigrations = []constructor{
 
 type Migration interface {
 	Name() string
-	IsBlocking() bool
 	Migrate(ctx context.Context) error
 }
 
 type Controller struct {
 	client client.Client
 	log    *log.Logger
 
-	blockingMigrations    []Migration
-	nonBlockingMigrations []Migration
+	migrations []Migration
 }
 
 func NewController(client client.Client, log *log.Logger) (*Controller, error) {
-	var (
-		blockingMigrations    []Migration
-		nonBlockingMigrations []Migration
-	)
-	for _, newMigration := range newMigrations {
+	migrations := make([]Migration, len(newMigrations))
+	for i, newMigration := range newMigrations {
 		m, err := newMigration(client, log)
 		if err != nil {
 			return nil, err
 		}
-		if m.IsBlocking() {
-			blockingMigrations = append(blockingMigrations, m)
-		} else {
-			nonBlockingMigrations = append(nonBlockingMigrations, m)
-		}
+		migrations[i] = m
 	}
 
 	return &Controller{
-		client:                client,
-		log:                   log,
-		blockingMigrations:    blockingMigrations,
-		nonBlockingMigrations: nonBlockingMigrations,
+		client:     client,
+		log:        log,
+		migrations: migrations,
 	}, nil
 }
 
 func (c *Controller) Run(ctx context.Context) {
 	wg := &sync.WaitGroup{}
 
-	c.run(ctx, nil, c.nonBlockingMigrations)
-	c.run(ctx, wg, c.blockingMigrations)
-	// Wait for blocking migrations only
+	c.run(ctx, wg, c.migrations)
 	wg.Wait()
 }
 

images/virtualization-artifact/pkg/migration/qemu_max_length_36.go

@@ -52,10 +52,6 @@ func (r *qemuMaxLength36) Name() string {
 	return qemuMaxLength36ControllerName
 }
 
-func (r *qemuMaxLength36) IsBlocking() bool {
-	return true
-}
-
 func (r *qemuMaxLength36) Migrate(ctx context.Context) error {
 	kvvmList := &virtv1.VirtualMachineList{}
 	err := r.client.List(ctx, kvvmList)