Use MarkStatus* helpers in pkg/pod/status

Use MarkStatus* helper functions in pkg/pod/status.go Closes #2770 Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
tektoncd · Jun 10, 2020 · 3ded563 · 3ded563
1 parent 64678e3
commit 3ded563
Showing 1 changed file with 39 additions and 30 deletions.
diff --git a/pkg/pod/status.go b/pkg/pod/status.go
@@ -101,12 +101,7 @@ func MakeTaskRunStatus(logger *zap.SugaredLogger, tr v1beta1.TaskRun, pod *corev
 	trs := &tr.Status
 	if trs.GetCondition(apis.ConditionSucceeded) == nil || trs.GetCondition(apis.ConditionSucceeded).Status == corev1.ConditionUnknown {
 		// If the taskRunStatus doesn't exist yet, it's because we just started running
-		trs.SetCondition(&apis.Condition{
-			Type:    apis.ConditionSucceeded,
-			Status:  corev1.ConditionUnknown,
-			Reason:  v1beta1.TaskRunReasonRunning.String(),
-			Message: "Not all Steps in the Task have finished executing",
-		})
+		MarkStatusRunning(trs, "", "")
 	}
 
 	trs.PodName = pod.Name
@@ -184,19 +179,9 @@ func updateStatusStartTime(s *corev1.ContainerStatus) error {
 func updateCompletedTaskRun(trs *v1beta1.TaskRunStatus, pod *corev1.Pod) {
 	if DidTaskRunFail(pod) {
 		msg := getFailureMessage(pod)
-		trs.SetCondition(&apis.Condition{
-			Type:    apis.ConditionSucceeded,
-			Status:  corev1.ConditionFalse,
-			Reason:  v1beta1.TaskRunReasonFailed.String(),
-			Message: msg,
-		})
+		MarkStatusFailure(trs, msg)
 	} else {
-		trs.SetCondition(&apis.Condition{
-			Type:    apis.ConditionSucceeded,
-			Status:  corev1.ConditionTrue,
-			Reason:  v1beta1.TaskRunReasonSuccessful.String(),
-			Message: "All Steps have completed executing",
-		})
+		MarkStatusSuccess(trs)
 	}
 
 	// update tr completed time
@@ -206,12 +191,7 @@ func updateCompletedTaskRun(trs *v1beta1.TaskRunStatus, pod *corev1.Pod) {
 func updateIncompleteTaskRun(trs *v1beta1.TaskRunStatus, pod *corev1.Pod) {
 	switch pod.Status.Phase {
 	case corev1.PodRunning:
-		trs.SetCondition(&apis.Condition{
-			Type:    apis.ConditionSucceeded,
-			Status:  corev1.ConditionUnknown,
-			Reason:  v1beta1.TaskRunReasonRunning.String(),
-			Message: "Not all Steps in the Task have finished executing",
-		})
+		MarkStatusRunning(trs, "", "")
 	case corev1.PodPending:
 		var reason, msg string
 		switch {
@@ -225,12 +205,7 @@ func updateIncompleteTaskRun(trs *v1beta1.TaskRunStatus, pod *corev1.Pod) {
 			reason = ReasonPending
 			msg = getWaitingMessage(pod)
 		}
-		trs.SetCondition(&apis.Condition{
-			Type:    apis.ConditionSucceeded,
-			Status:  corev1.ConditionUnknown,
-			Reason:  reason,
-			Message: msg,
-		})
+		MarkStatusRunning(trs, reason, msg)
 	}
 }
 
@@ -359,6 +334,40 @@ func getWaitingMessage(pod *corev1.Pod) string {
 	return "Pending"
 }
 
+func MarkStatusRunning(trs *v1beta1.TaskRunStatus, reason, message string) {
+	if reason == "" {
+		reason = v1beta1.TaskRunReasonRunning.String()
+	}
+	if message == "" {
+		message = "Not all Steps in the Task have finished executing"
+	}
+
+	trs.SetCondition(&apis.Condition{
+		Type:    apis.ConditionSucceeded,
+		Status:  corev1.ConditionUnknown,
+		Reason:  reason,
+		Message: message,
+	})
+}
+
+func MarkStatusFailure(trs *v1beta1.TaskRunStatus, message string) {
+	trs.SetCondition(&apis.Condition{
+		Type:    apis.ConditionSucceeded,
+		Status:  corev1.ConditionFalse,
+		Reason:  v1beta1.TaskRunReasonFailed.String(),
+		Message: message,
+	})
+}
+
+func MarkStatusSuccess(trs *v1beta1.TaskRunStatus) {
+	trs.SetCondition(&apis.Condition{
+		Type:    apis.ConditionSucceeded,
+		Status:  corev1.ConditionTrue,
+		Reason:  v1beta1.TaskRunReasonSuccessful.String(),
+		Message: "All Steps have completed executing",
+	})
+}
+
 // sortTaskRunStepOrder sorts the StepStates in the same order as the original
 // TaskSpec steps.
 func sortTaskRunStepOrder(taskRunSteps []v1beta1.StepState, taskSpecSteps []v1beta1.Step) []v1beta1.StepState {