@@ -168,7 +168,8 @@ func (opsMgr *OpsManager) Reconcile(reqCtx intctrlutil.RequestCtx, cli client.Cl
168168 if opsRequest .Spec .Type == opsv1alpha1 .CustomType {
169169 err = initOpsDefAndValidate (reqCtx , cli , opsRes )
170170 if intctrlutil .IsTargetError (err , intctrlutil .ErrorTypeFatal ) {
171- return requeueAfter , patchValidateErrorCondition (reqCtx .Ctx , cli , opsRes , err .Error ())
171+ return requeueAfter , opsMgr .handleOpsCompleted (reqCtx , cli , opsRes , opsv1alpha1 .OpsFailedPhase ,
172+ opsv1alpha1 .NewCancelFailedCondition (opsRequest , err ), opsv1alpha1 .NewValidateFailedCondition (opsv1alpha1 .ReasonValidateFailed , err .Error ()))
172173 }
173174 if err != nil {
174175 return requeueAfter , err
@@ -177,7 +178,8 @@ func (opsMgr *OpsManager) Reconcile(reqCtx intctrlutil.RequestCtx, cli client.Cl
177178 if opsRequestPhase , requeueAfter , err = opsBehaviour .OpsHandler .ReconcileAction (reqCtx , cli , opsRes ); err != nil &&
178179 ! isOpsRequestFailedPhase (opsRequestPhase ) {
179180 if intctrlutil .IsTargetError (err , intctrlutil .ErrorTypeFatal ) {
180- return requeueAfter , patchFatalFailErrorCondition (reqCtx .Ctx , cli , opsRes , err )
181+ return requeueAfter , opsMgr .handleOpsCompleted (reqCtx , cli , opsRes , opsv1alpha1 .OpsFailedPhase ,
182+ opsv1alpha1 .NewCancelFailedCondition (opsRequest , err ), opsv1alpha1 .NewFailedCondition (opsRequest , err ))
181183 }
182184 // if the opsRequest phase is not failed, skipped
183185 return requeueAfter , err
0 commit comments