Skip to content

Commit

Permalink
chore(lifecycle-operator): refactor WorkloadVersionReconciler (kept…
Browse files Browse the repository at this point in the history 
…n#2417)

Signed-off-by: Florian Bacher <[email protected]>
  • Loading branch information
@bacherfl
bacherfl authored Nov 7, 2023
1 parent d4d5c53 commit c41f909
Show file tree
Hide file tree
Showing 2 changed files with 442 additions and 41 deletions.
137 changes: 96 additions & 41 deletions lifecycle-operator/controllers/lifecycle/keptnworkloadversion/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ func (r *KeptnWorkloadVersionReconciler) Reconcile(ctx context.Context, req ctrl
appTraceContextCarrier := propagation.MapCarrier(workloadVersion.Spec.TraceId)
ctxAppTrace := otel.GetTextMapPropagator().Extract(context.TODO(), appTraceContextCarrier)

// Wait for pre-deployment checks of Workload
currentPhase := apicommon.PhaseWorkloadPreDeployment
phaseHandler := phase.Handler{
Client: r.Client,
EventSender: r.EventSender,
Expand All @@ -124,26 +122,14 @@ func (r *KeptnWorkloadVersionReconciler) Reconcile(ctx context.Context, req ctrl
spanWorkloadTrace.AddEvent("WorkloadVersion Pre-Deployment Tasks started", trace.WithTimestamp(time.Now()))
}

if !workloadVersion.IsPreDeploymentSucceeded() {
reconcilePre := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcilePrePostDeployment(ctx, phaseCtx, workloadVersion, apicommon.PreDeploymentCheckType)
}
result, err := phaseHandler.HandlePhase(ctx, ctxWorkloadTrace, r.getTracer(), workloadVersion, currentPhase, reconcilePre)
if !result.Continue {
return result.Result, err
}
// Wait for pre-deployment checks of Workload
if result, err := r.doPreDeploymentTaskPhase(ctx, workloadVersion, phaseHandler, ctxWorkloadTrace); !result.Continue {
return result.Result, err
}

// Wait for pre-evaluation checks of Workload
currentPhase = apicommon.PhaseWorkloadPreEvaluation
if !workloadVersion.IsPreDeploymentEvaluationSucceeded() {
reconcilePreEval := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcilePrePostEvaluation(ctx, phaseCtx, workloadVersion, apicommon.PreDeploymentEvaluationCheckType)
}
result, err := phaseHandler.HandlePhase(ctx, ctxWorkloadTrace, r.getTracer(), workloadVersion, currentPhase, reconcilePreEval)
if !result.Continue {
return result.Result, err
}
if result, err := r.doPreDeploymentEvaluationPhase(ctx, workloadVersion, phaseHandler, ctxWorkloadTrace); !result.Continue {
return result.Result, err
}

if r.SchedulingGatesHandler.Enabled() {
Expand All @@ -155,43 +141,112 @@ func (r *KeptnWorkloadVersionReconciler) Reconcile(ctx context.Context, req ctrl
}

// Wait for deployment of Workload
currentPhase = apicommon.PhaseWorkloadDeployment
if result, err := r.doDeploymentPhase(ctx, workloadVersion, phaseHandler, ctxWorkloadTrace); !result.Continue {
return result.Result, err
}

// Wait for post-deployment checks of Workload
if result, err := r.doPostDeploymentTaskPhase(ctx, workloadVersion, phaseHandler, ctxWorkloadTrace); !result.Continue {
return result.Result, err
}

// Wait for post-evaluation checks of Workload
if result, err := r.doPostDeploymentEvaluationPhase(ctx, workloadVersion, phaseHandler, ctxWorkloadTrace); !result.Continue {
return result.Result, err
}

// WorkloadVersion is completed at this place
return r.finishKeptnWorkloadVersionReconcile(ctx, workloadVersion, spanWorkloadTrace)
}

func (r *KeptnWorkloadVersionReconciler) doPreDeploymentTaskPhase(ctx context.Context, workloadVersion *klcv1alpha4.KeptnWorkloadVersion, phaseHandler phase.Handler, ctxWorkloadTrace context.Context) (*phase.PhaseResult, error) {
if !workloadVersion.IsPreDeploymentSucceeded() {
reconcilePre := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcilePrePostDeployment(ctx, phaseCtx, workloadVersion, apicommon.PreDeploymentCheckType)
}
return phaseHandler.HandlePhase(ctx,
ctxWorkloadTrace,
r.getTracer(),
workloadVersion,
apicommon.PhaseWorkloadPreDeployment,
reconcilePre,
)
}
return &phase.PhaseResult{
Continue: true,
}, nil
}

func (r *KeptnWorkloadVersionReconciler) doPreDeploymentEvaluationPhase(ctx context.Context, workloadVersion *klcv1alpha4.KeptnWorkloadVersion, phaseHandler phase.Handler, ctxWorkloadTrace context.Context) (*phase.PhaseResult, error) {
if !workloadVersion.IsPreDeploymentEvaluationSucceeded() {
reconcilePreEval := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcilePrePostEvaluation(ctx, phaseCtx, workloadVersion, apicommon.PreDeploymentEvaluationCheckType)
}
return phaseHandler.HandlePhase(ctx,
ctxWorkloadTrace,
r.getTracer(),
workloadVersion,
apicommon.PhaseWorkloadPreEvaluation,
reconcilePreEval,
)
}
return &phase.PhaseResult{
Continue: true,
}, nil
}

func (r *KeptnWorkloadVersionReconciler) doDeploymentPhase(ctx context.Context, workloadVersion *klcv1alpha4.KeptnWorkloadVersion, phaseHandler phase.Handler, ctxWorkloadTrace context.Context) (*phase.PhaseResult, error) {
if !workloadVersion.IsDeploymentSucceeded() {
reconcileWorkloadVersion := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcileDeployment(ctx, workloadVersion)
}
result, err := phaseHandler.HandlePhase(ctx, ctxWorkloadTrace, r.getTracer(), workloadVersion, currentPhase, reconcileWorkloadVersion)
if !result.Continue {
return result.Result, err
}
return phaseHandler.HandlePhase(ctx,
ctxWorkloadTrace,
r.getTracer(),
workloadVersion,
apicommon.PhaseWorkloadDeployment,
reconcileWorkloadVersion,
)
}
return &phase.PhaseResult{
Continue: true,
}, nil
}

// Wait for post-deployment checks of Workload
currentPhase = apicommon.PhaseWorkloadPostDeployment
if !workloadVersion.IsPostDeploymentSucceeded() {
reconcilePostDeployment := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
func (r *KeptnWorkloadVersionReconciler) doPostDeploymentTaskPhase(ctx context.Context, workloadVersion *klcv1alpha4.KeptnWorkloadVersion, phaseHandler phase.Handler, ctxWorkloadTrace context.Context) (*phase.PhaseResult, error) {
if !workloadVersion.IsPostDeploymentCompleted() {
reconcilePost := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcilePrePostDeployment(ctx, phaseCtx, workloadVersion, apicommon.PostDeploymentCheckType)
}
result, err := phaseHandler.HandlePhase(ctx, ctxWorkloadTrace, r.getTracer(), workloadVersion, currentPhase, reconcilePostDeployment)
if !result.Continue {
return result.Result, err
}
return phaseHandler.HandlePhase(ctx,
ctxWorkloadTrace,
r.getTracer(),
workloadVersion,
apicommon.PhaseWorkloadPostDeployment,
reconcilePost,
)
}
return &phase.PhaseResult{
Continue: true,
}, nil
}

// Wait for post-evaluation checks of Workload
currentPhase = apicommon.PhaseWorkloadPostEvaluation
func (r *KeptnWorkloadVersionReconciler) doPostDeploymentEvaluationPhase(ctx context.Context, workloadVersion *klcv1alpha4.KeptnWorkloadVersion, phaseHandler phase.Handler, ctxWorkloadTrace context.Context) (*phase.PhaseResult, error) {
if !workloadVersion.IsPostDeploymentEvaluationSucceeded() {
reconcilePostEval := func(phaseCtx context.Context) (apicommon.KeptnState, error) {
return r.reconcilePrePostEvaluation(ctx, phaseCtx, workloadVersion, apicommon.PostDeploymentEvaluationCheckType)
}
result, err := phaseHandler.HandlePhase(ctx, ctxWorkloadTrace, r.getTracer(), workloadVersion, currentPhase, reconcilePostEval)
if !result.Continue {
return result.Result, err
}
return phaseHandler.HandlePhase(ctx,
ctxWorkloadTrace,
r.getTracer(),
workloadVersion,
apicommon.PhaseAppPostEvaluation,
reconcilePostEval,
)
}

// WorkloadVersion is completed at this place
return r.finishKeptnWorkloadVersionReconcile(ctx, workloadVersion, spanWorkloadTrace)
return &phase.PhaseResult{
Continue: true,
}, nil
}

func (r *KeptnWorkloadVersionReconciler) finishKeptnWorkloadVersionReconcile(ctx context.Context, workloadVersion *klcv1alpha4.KeptnWorkloadVersion, spanWorkloadTrace trace.Span) (ctrl.Result, error) {
Expand Down
Loading

0 comments on commit c41f909

Please sign in to comment.