Skip to content

Commit c057a46

Browse files
committed
simplify InProgress reason
Signed-off-by: Daniil Antoshin <[email protected]>
1 parent 865e738 commit c057a46

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

images/virtualization-artifact/pkg/controller/vmop/restore/internal/handler/lifecycle.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,9 @@ func (h LifecycleHandler) syncOperationComplete(changed *v1alpha2.VirtualMachine
199199
return nil
200200
}
201201

202-
// Keep InProgress phase as-is (InProgress), set complete condition to false.
203-
reason := svcOp.GetInProgressReason()
204202
conditions.SetCondition(
205203
completedCond.
206-
Reason(reason).
204+
Reason(vmopcondition.ReasonRestoreOperationInProgress).
207205
Status(metav1.ConditionFalse).
208206
Message("Wait until operation completed"),
209207
&changed.Status.Conditions)

images/virtualization-artifact/pkg/controller/vmop/restore/internal/service/restore.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ func (o RestoreOperation) IsApplicableForRunPolicy(runPolicy virtv2.RunPolicy) b
6464
return runPolicy == virtv2.ManualPolicy || runPolicy == virtv2.AlwaysOnUnlessStoppedManually || runPolicy == virtv2.AlwaysOffPolicy
6565
}
6666

67-
func (o RestoreOperation) GetInProgressReason() vmopcondition.ReasonCompleted {
68-
return vmopcondition.ReasonCompleted(vmopcondition.ReasonRestoreOperationInProgress)
69-
}
70-
7167
func (o RestoreOperation) IsComplete() (bool, string, error) {
7268
c, ok := conditions.GetCondition(vmopcondition.TypeRestoreCompleted, o.vmop.Status.Conditions)
7369
return ok && c.Status == metav1.ConditionTrue, "", nil

0 commit comments

Comments
 (0)