WIP: set OOMKilled even if other build failure is present

Jan Wozniak · Jan Wozniak · commit e2dfc849d2cd · 2018-07-13T14:17:03.000+02:00
diff --git a/pkg/build/controller/build/build_controller.go b/pkg/build/controller/build/build_controller.go
@@ -1001,13 +1001,14 @@ func (bc *BuildController) handleActiveBuild(build *buildapi.Build, pod *v1.Pod)
 			}
 		}
 	case v1.PodFailed:
+		if isOOMKilled(pod) {
+			update = transitionToPhase(buildapi.BuildPhaseFailed, buildapi.StatusReasonOutOfMemoryKilled, buildapi.StatusMessageOutOfMemoryKilled)
+		}
 		if build.Status.Phase != buildapi.BuildPhaseFailed {
 			// If a DeletionTimestamp has been set, it means that the pod will
 			// soon be deleted. The build should be transitioned to the Error phase.
 			if pod.DeletionTimestamp != nil {
 				update = transitionToPhase(buildapi.BuildPhaseError, buildapi.StatusReasonBuildPodDeleted, buildapi.StatusMessageBuildPodDeleted)
-			} else if isOOMKilled(pod) {
-				update = transitionToPhase(buildapi.BuildPhaseFailed, buildapi.StatusReasonOutOfMemoryKilled, buildapi.StatusMessageOutOfMemoryKilled)
 			} else {
 				update = transitionToPhase(buildapi.BuildPhaseFailed, buildapi.StatusReasonGenericBuildFailed, buildapi.StatusMessageGenericBuildFailed)
 			}

Original file line number	Diff line number	Diff line change
`@@ -1001,13 +1001,14 @@ func (bc BuildController) handleActiveBuild(build buildapi.Build, pod *v1.Pod)`
`1001`	`1001`	`}`
`1002`	`1002`	`}`
`1003`	`1003`	`case v1.PodFailed:`
	`1004`	`+ if isOOMKilled(pod) {`
	`1005`	`+ update = transitionToPhase(buildapi.BuildPhaseFailed, buildapi.StatusReasonOutOfMemoryKilled, buildapi.StatusMessageOutOfMemoryKilled)`
	`1006`	`+ }`
`1004`	`1007`	`if build.Status.Phase != buildapi.BuildPhaseFailed {`
`1005`	`1008`	`// If a DeletionTimestamp has been set, it means that the pod will`
`1006`	`1009`	`// soon be deleted. The build should be transitioned to the Error phase.`
`1007`	`1010`	`if pod.DeletionTimestamp != nil {`
`1008`	`1011`	`update = transitionToPhase(buildapi.BuildPhaseError, buildapi.StatusReasonBuildPodDeleted, buildapi.StatusMessageBuildPodDeleted)`
`1009`		`- } else if isOOMKilled(pod) {`
`1010`		`- update = transitionToPhase(buildapi.BuildPhaseFailed, buildapi.StatusReasonOutOfMemoryKilled, buildapi.StatusMessageOutOfMemoryKilled)`
`1011`	`1012`	`} else {`
`1012`	`1013`	`update = transitionToPhase(buildapi.BuildPhaseFailed, buildapi.StatusReasonGenericBuildFailed, buildapi.StatusMessageGenericBuildFailed)`
`1013`	`1014`	`}`