From 71a9cbc9861fde1fc665bd3a39c2306e3f1cf239 Mon Sep 17 00:00:00 2001 From: odubajDT Date: Thu, 17 Nov 2022 07:17:21 +0100 Subject: [PATCH] do not cancel workloads when app pre-eval checks fail Signed-off-by: odubajDT --- .../controllers/keptnworkloadinstance/controller.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/operator/controllers/keptnworkloadinstance/controller.go b/operator/controllers/keptnworkloadinstance/controller.go index 7a1eb5ec5b..c44202220d 100644 --- a/operator/controllers/keptnworkloadinstance/controller.go +++ b/operator/controllers/keptnworkloadinstance/controller.go @@ -128,11 +128,6 @@ func (r *KeptnWorkloadInstanceReconciler) Reconcile(ctx context.Context, req ctr appPreEvalStatus := appVersion.Status.PreDeploymentEvaluationStatus if !appPreEvalStatus.IsSucceeded() { if appPreEvalStatus.IsFailed() { - //cancel everything, as app pre-eval tasks have failed - if err := r.cancelWorkloadInstanceActions(ctx, workloadInstance, phase); err != nil { - span.SetStatus(codes.Error, err.Error()) - return ctrl.Result{Requeue: true}, err - } controllercommon.RecordEvent(r.Recorder, phase, "Warning", workloadInstance, "Failed", "has failed since app has failed", workloadInstance.GetVersion()) return ctrl.Result{Requeue: true, RequeueAfter: 20 * time.Second}, nil } @@ -320,9 +315,3 @@ func getLatestAppVersion(apps *klcv1alpha1.KeptnAppVersionList, wli *klcv1alpha1 } return workloadFound, latestVersion, nil } - -func (r *KeptnWorkloadInstanceReconciler) cancelWorkloadInstanceActions(ctx context.Context, workloadInstance *klcv1alpha1.KeptnWorkloadInstance, phase common.KeptnPhaseType) error { - workloadInstance.CancelRemainingPhases(phase) - workloadInstance.Complete() - return r.Client.Status().Update(ctx, workloadInstance) -}