Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: yaroslavborbat <[email protected]>
  • Loading branch information
yaroslavborbat committed Nov 13, 2024
1 parent 20a2253 commit e71c0a7
Showing 1 changed file with 21 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ index 0c4bfca389..cf7440e84f 100644
if len(dvs) == 0 {
return
diff --git a/pkg/virt-controller/watch/workload-updater/workload-updater.go b/pkg/virt-controller/watch/workload-updater/workload-updater.go
index a7d0f76e24..0482b732fe 100644
index a7d0f76e24..c5fe5374ae 100644
--- a/pkg/virt-controller/watch/workload-updater/workload-updater.go
+++ b/pkg/virt-controller/watch/workload-updater/workload-updater.go
@@ -214,7 +214,7 @@ func (c *WorkloadUpdateController) updateVmi(_, obj interface{}) {
Expand All @@ -81,6 +81,26 @@ index a7d0f76e24..0482b732fe 100644
func (c *WorkloadUpdateController) doesRequireMigration(vmi *virtv1.VirtualMachineInstance) bool {
if vmi.IsFinal() || migrationutils.IsMigrating(vmi) {
return false
@@ -337,6 +342,9 @@ func (c *WorkloadUpdateController) doesRequireMigration(vmi *virtv1.VirtualMachi
if isVolumesUpdateInProgress(vmi) {
return true
}
+ if isNodePlacementInProgress(vmi) {
+ return true
+ }

return false
}
@@ -352,6 +360,9 @@ func (c *WorkloadUpdateController) shouldAbortMigration(vmi *virtv1.VirtualMachi
if isVolumesUpdateInProgress(vmi) {
return false
}
+ if isNodePlacementInProgress(vmi) {
+ return false
+ }
if vmi.Status.MigrationState != nil && vmi.Status.MigrationState.TargetNodeDomainReadyTimestamp != nil {
return false
}
diff --git a/staging/src/kubevirt.io/api/core/v1/types.go b/staging/src/kubevirt.io/api/core/v1/types.go
index 7aa814d8f1..b7e5792a71 100644
--- a/staging/src/kubevirt.io/api/core/v1/types.go
Expand Down

0 comments on commit e71c0a7

Please sign in to comment.