Merge branch 'failed-job' into 'main'

Ensure that failed status is created for introspector job

See merge request weblogic-cloud/weblogic-kubernetes-operator!4734

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/helpers/JobHelper.java

@@ -239,7 +239,7 @@ public Result onSuccess(Packet packet, KubernetesApiResponse<T> callResponse) {
           packet.put(DOMAIN_INTROSPECTOR_JOB, job);
         }
 
-        if (isKnownFailedJob(job) || JobWatcher.isJobTimedOut(job) || isInProgressJobOutdated(job)) {
+        if (isInProgressJobOutdated(job)) {
           return doNext(cleanUpAndReintrospect(getNext()), packet);
         } else if (job != null) {
           return doNext(processExistingIntrospectorJob(getNext()), packet);
@@ -332,20 +332,6 @@ String getIntrospectVersionLabelFromJob(V1Job job) {
             .orElse(null);
       }
 
-      private boolean isKnownFailedJob(V1Job job) {
-        return getUid(job).equals(getLastFailedUid());
-      }
-
-      @Nonnull
-      private String getUid(V1Job job) {
-        return Optional.ofNullable(job).map(V1Job::getMetadata).map(V1ObjectMeta::getUid).orElse("");
-      }
-
-      @Nullable
-      private String getLastFailedUid() {
-        return getDomain().getOrCreateStatus().getFailedIntrospectionUid();
-      }
-
       private boolean isIntrospectionNeeded(Packet packet) {
         return getDomainTopology() == null
               || isBringingUpNewDomain(packet)

operator/src/main/java/oracle/kubernetes/operator/watcher/JobWatcher.java

@@ -208,10 +208,6 @@ private String getJobName(Watch.Response<V1Job> item) {
     return item.object.getMetadata().getName();
   }
 
-  public static boolean isJobTimedOut(V1Job job) {
-    return isFailed(job) && ("DeadlineExceeded".equals(getFailedReason(job)));
-  }
-
   public static class DeadlineExceededException extends Exception implements IntrospectionJobHolder {
     @Serial
     private static final long serialVersionUID  = 1L;

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainStatus.java

@@ -733,7 +733,7 @@ public DomainConditionFailureInfo getFailureInfo() {
   public DomainCondition createAdjustedFailedCondition(DomainFailureReason reason, String message,
                                                        boolean isInitDomainOnPV, DomainSpec spec) {
     DomainFailureReason effectiveReason = reason;
-    String effectiveMessage = message;
+    String effectiveMessage = Optional.ofNullable(message).orElse("");
     if (hasJustGotFatalIntrospectorError(effectiveMessage)
         || initDomainOnPVIntropsectionFailure(reason, isInitDomainOnPV)) {
       effectiveReason = ABORTED;