Merge branch 'main' into refactor/vd/use-condition-builder-as-conditi…

…on-api
deckhouse · Nov 11, 2024 · 95f6cf6 · 95f6cf6
2 parents 5d91379 + d26a0fb
commit 95f6cf6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/sync_kvvm.go b/images/virtualization-artifact/pkg/controller/vm/internal/sync_kvvm.go
@@ -215,6 +215,11 @@ func (h *SyncKvvmHandler) isWaiting(vm *virtv2.VirtualMachine) bool {
 			if c.Status != metav1.ConditionTrue {
 				return true
 			}
+
+		case vmcondition.TypeSizingPolicyMatched:
+			if c.Status != metav1.ConditionTrue {
+				return true
+			}
 		}
 	}
 	return false

diff --git a/images/virtualization-artifact/pkg/controller/vm/vm_controller.go b/images/virtualization-artifact/pkg/controller/vm/vm_controller.go
@@ -62,11 +62,11 @@ func SetupController(
 		internal.NewFilesystemHandler(),
 		internal.NewSnapshottingHandler(client),
 		internal.NewPodHandler(client),
+		internal.NewSizePolicyHandler(),
 		internal.NewSyncKvvmHandler(dvcrSettings, client, recorder),
 		internal.NewSyncMetadataHandler(client),
 		internal.NewLifeCycleHandler(client, recorder),
 		internal.NewStatisticHandler(client),
-		internal.NewSizePolicyHandler(),
 	}
 	r := NewReconciler(client, handlers...)