Merge branch 'owls-121733-diagnose' into 'main'

rjeberhard · rjeberhard · commit a6ca95936986 · 2025-05-18T14:55:36.000Z
Check for job FailureTarget condition

See merge request weblogic-cloud/weblogic-kubernetes-operator!4972
diff --git a/operator/src/main/java/oracle/kubernetes/operator/watcher/JobWatcher.java b/operator/src/main/java/oracle/kubernetes/operator/watcher/JobWatcher.java
@@ -171,7 +171,8 @@ public static String getFailedReason(V1Job job) {
     V1JobStatus status = job.getStatus();
     if (status != null && status.getConditions() != null) {
       for (V1JobCondition cond : status.getConditions()) {
-        if ("Failed".equals(cond.getType()) && "True".equals(cond.getStatus())) {
+        if (("FailureTarget".equals(cond.getType()) || "Failed".equals(cond.getType()))
+              && "True".equals(cond.getStatus())) {
           return cond.getReason();
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,8 @@ public static String getFailedReason(V1Job job) {`
`171`	`171`	`V1JobStatus status = job.getStatus();`
`172`	`172`	`if (status != null && status.getConditions() != null) {`
`173`	`173`	`for (V1JobCondition cond : status.getConditions()) {`
`174`		`- if ("Failed".equals(cond.getType()) && "True".equals(cond.getStatus())) {`
	`174`	`+ if (("FailureTarget".equals(cond.getType()) \|\| "Failed".equals(cond.getType()))`
	`175`	`+ && "True".equals(cond.getStatus())) {`
`175`	`176`	`return cond.getReason();`
`176`	`177`	`}`
`177`	`178`	`}`