Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,6 @@ func (h LifecycleHandler) syncOperationComplete(ctx context.Context, vmop *v1alp
}

func (h LifecycleHandler) isApplicableForLiveMigrationPolicy(vmop *v1alpha2.VirtualMachineOperation, vm *v1alpha2.VirtualMachine) (string, bool) {
// No problems if force flag is not specified.
if vmop.Spec.Force == nil {
return "", true
}

effectivePolicy, autoConverge, err := livemigration.CalculateEffectivePolicy(*vm, vmop)
if err != nil {
msg := fmt.Sprintf("Operation is invalid: %v", err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ var _ = Describe("LifecycleHandler", func() {
),

// AlwaysForced cases.
Entry("is ok for AlwaysForced and force=nil",
Entry("should become Failed for AlwaysForced and force=nil",
newVMOPEvictPending(),
v1alpha2.AlwaysForcedMigrationPolicy,
v1alpha2.VMOPPhasePending,
v1alpha2.VMOPPhaseFailed,
),
Entry("should become Failed for AlwaysForced and force=false",
newVMOPEvictPending(vmopbuilder.WithForce(ptr.To(false))),
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/livemigration/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ func CalculateEffectivePolicy(vm v1alpha2.VirtualMachine, vmop *v1alpha2.Virtual
return effectivePolicy, *autoConvergePtr, fmt.Errorf("force=true is not applicable for VM liveMigrationPolicy %s", effectivePolicy)
}
case v1alpha2.AlwaysForcedMigrationPolicy:
if vmop.Spec.Force != nil && !*vmop.Spec.Force {
return effectivePolicy, *autoConvergePtr, fmt.Errorf("force=false is not applicable for VM liveMigrationPolicy %s", effectivePolicy)
if vmop.Spec.Force == nil || !*vmop.Spec.Force {
return effectivePolicy, *autoConvergePtr, fmt.Errorf("force=true is required for VM liveMigrationPolicy %s", effectivePolicy)
}
}
}
Expand Down
Loading