Skip to content

Commit

Permalink
Refactor build and buildrun timeout logic
Browse files Browse the repository at this point in the history
Externalize logic to get the effective timeout from build and builrun
tuple into a separate function.

Signed-off-by: Enrique Eduardo Encalada Olivas <encalada@de.ibm.com>
  • Loading branch information
HeavyWombat authored and qu1queee committed Dec 8, 2020
1 parent 6ce5153 commit 02b142c
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions pkg/controller/buildrun/generate_taskrun.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,7 @@ func GenerateTaskRun(
expectedTaskRun.Labels[label] = value
}

// assign the timeout
if buildRun.Spec.Timeout != nil {
expectedTaskRun.Spec.Timeout = buildRun.Spec.Timeout
} else if build.Spec.Timeout != nil {
expectedTaskRun.Spec.Timeout = build.Spec.Timeout
}
expectedTaskRun.Spec.Timeout = effectiveTimeout(build, buildRun)

var inputParams []v1beta1.Param
if build.Spec.BuilderImage != nil {
Expand Down Expand Up @@ -297,3 +292,14 @@ func GenerateTaskRun(
expectedTaskRun.Spec.Params = inputParams
return expectedTaskRun, nil
}

func effectiveTimeout(build *buildv1alpha1.Build, buildRun *buildv1alpha1.BuildRun) *metav1.Duration {
if buildRun.Spec.Timeout != nil {
return buildRun.Spec.Timeout

} else if build.Spec.Timeout != nil {
return build.Spec.Timeout
}

return nil
}

0 comments on commit 02b142c

Please sign in to comment.