pr review

Signed-off-by: Florian Bacher <[email protected]>
keptn · Oct 20, 2022 · a47d0a3 · a47d0a3
1 parent 2f29775
commit a47d0a3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/operator/controllers/keptnappversion/controller.go b/operator/controllers/keptnappversion/controller.go
@@ -80,9 +80,7 @@ func (r *KeptnAppVersionReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return reconcile.Result{}, fmt.Errorf("could not fetch KeptnappVersion: %+v", err)
 	}
 
-	if !appVersion.IsStartTimeSet() {
-		appVersion.SetStartTime()
-	}
+	appVersion.SetStartTime()
 
 	traceContextCarrier := propagation.MapCarrier(appVersion.Annotations)
 	ctx = otel.GetTextMapPropagator().Extract(ctx, traceContextCarrier)

diff --git a/operator/controllers/keptnevaluation/controller.go b/operator/controllers/keptnevaluation/controller.go
@@ -94,9 +94,7 @@ func (r *KeptnEvaluationReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 	semconv.AddAttributeFromEvaluation(span, *evaluation)
 
-	if !evaluation.IsStartTimeSet() {
-		evaluation.SetStartTime()
-	}
+	evaluation.SetStartTime()
 
 	if evaluation.Status.RetryCount >= evaluation.Spec.Retries {
 		r.recordEvent("Warning", evaluation, "ReconcileTimeOut", "retryCount exceeded")
@@ -180,9 +178,7 @@ func (r *KeptnEvaluationReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 func (r *KeptnEvaluationReconciler) updateFinishedEvaluationMetrics(ctx context.Context, evaluation *klcv1alpha1.KeptnEvaluation, span trace.Span) error {
 	r.recordEvent("Normal", evaluation, string(evaluation.Status.OverallStatus), "the evaluation has "+string(evaluation.Status.OverallStatus))
 
-	if !evaluation.IsEndTimeSet() {
-		evaluation.SetEndTime()
-	}
+	evaluation.SetEndTime()
 
 	err := r.Client.Status().Update(ctx, evaluation)
 	if err != nil {

diff --git a/operator/controllers/keptntask/controller.go b/operator/controllers/keptntask/controller.go
@@ -77,9 +77,7 @@ func (r *KeptnTaskReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 
 	semconv.AddAttributeFromTask(span, *task)
 
-	if !task.IsStartTimeSet() {
-		task.SetStartTime()
-	}
+	task.SetStartTime()
 
 	err := r.Client.Status().Update(ctx, task)
 	if err != nil {
@@ -115,10 +113,7 @@ func (r *KeptnTaskReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	r.Log.Info("Finished Reconciling KeptnTask")
 
 	// Task is completed at this place
-
-	if !task.IsEndTimeSet() {
-		task.SetEndTime()
-	}
+	task.SetEndTime()
 
 	err = r.Client.Status().Update(ctx, task)
 	if err != nil {

diff --git a/operator/controllers/keptnworkloadinstance/controller.go b/operator/controllers/keptnworkloadinstance/controller.go
@@ -96,9 +96,7 @@ func (r *KeptnWorkloadInstanceReconciler) Reconcile(ctx context.Context, req ctr
 
 	semconv.AddAttributeFromWorkloadInstance(span, *workloadInstance)
 
-	if !workloadInstance.IsStartTimeSet() {
-		workloadInstance.SetStartTime()
-	}
+	workloadInstance.SetStartTime()
 
 	//Wait for pre-evaluation checks of App
 	phase := common.PhaseAppPreEvaluation