Address review comments

tektoncd · Jul 9, 2019 · 435472d · 435472d
1 parent 7d3d8c2
commit 435472d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/pkg/apis/pipeline/v1alpha1/condition_validation.go b/pkg/apis/pipeline/v1alpha1/condition_validation.go
@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	"context"
+
 	"github.com/knative/pkg/apis"
 	"k8s.io/apimachinery/pkg/api/equality"
 )

diff --git a/pkg/reconciler/v1alpha1/pipelinerun/pipelinerun.go b/pkg/reconciler/v1alpha1/pipelinerun/pipelinerun.go
@@ -483,7 +483,7 @@ func updateTaskRunsStatus(pr *v1alpha1.PipelineRun, pipelineState []*resources.R
 
 func (c *Reconciler) updateTaskRunsStatusDirectly(pr *v1alpha1.PipelineRun) error {
 	for taskRunName := range pr.Status.TaskRuns {
-		// TODO: Add conditionCheck statuses here
+		// TODO(dibyom): Add conditionCheck statuses here
 		prtrs := pr.Status.TaskRuns[taskRunName]
 		tr, err := c.taskRunLister.TaskRuns(pr.Namespace).Get(taskRunName)
 		if err != nil {
@@ -631,21 +631,16 @@ func (c *Reconciler) makeConditionCheckContainer(logger *zap.SugaredLogger, rprt
 
 func getTaskRunTimeout(pr *v1alpha1.PipelineRun) *metav1.Duration {
 	var taskRunTimeout = &metav1.Duration{Duration: 0 * time.Second}
-
-	if pr.Spec.Timeout != nil {
-		pTimeoutTime := pr.Status.StartTime.Add(pr.Spec.Timeout.Duration)
-		if time.Now().After(pTimeoutTime) {
-			// Just in case something goes awry and we're creating the TaskRun after it should have already timed out,
-			// set a timeout of 0.
-			taskRunTimeout = &metav1.Duration{Duration: time.Until(pTimeoutTime)}
-			if taskRunTimeout.Duration < 0 {
-				taskRunTimeout = &metav1.Duration{Duration: 0 * time.Second}
-			}
-		} else {
-			taskRunTimeout = pr.Spec.Timeout
+	pTimeoutTime := pr.Status.StartTime.Add(pr.Spec.Timeout.Duration)
+	if time.Now().After(pTimeoutTime) {
+		// Just in case something goes awry and we're creating the TaskRun after it should have already timed out,
+		// set a timeout of 0.
+		taskRunTimeout = &metav1.Duration{Duration: time.Until(pTimeoutTime)}
+		if taskRunTimeout.Duration < 0 {
+			taskRunTimeout = &metav1.Duration{Duration: 0 * time.Second}
 		}
 	} else {
-		taskRunTimeout = nil
+		taskRunTimeout = pr.Spec.Timeout
 	}
 	return taskRunTimeout
 }