Merge branch 'fix-readinessfailed-and-notrolling-update-42' into 'release/4.2'

Fix the case that when a pod is not ready because of readiness probe permanent...

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

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/PodWatcher.java

@@ -277,7 +277,8 @@ private WaitForPodReadyStep(String podName, Step next) {
     // A pod is ready if it is not being deleted and has the ready status.
     @Override
     protected boolean isReady(V1Pod result) {
-      return result != null && !PodHelper.isDeleting(result) && PodHelper.isReady(result);
+      return result != null && (!PodHelper.isDeleting(result) && (PodHelper.isReady(result)
+              || PodHelper.isWaitingToRoll(result)));
     }
 
     // Pods should be processed if ready.

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

@@ -115,6 +115,19 @@ public static boolean isReady(V1Pod pod) {
     return ready;
   }
 
+  /**
+   * Is the pod waiting to roll.
+   * @param pod pod
+   * @return true if the pod is waiting to roll
+   */
+  public static boolean isWaitingToRoll(V1Pod pod) {
+    return Optional.ofNullable(pod)
+            .map(V1Pod::getMetadata)
+            .map(V1ObjectMeta::getLabels)
+            .map(labels -> "true".equalsIgnoreCase(labels.get(LabelConstants.TO_BE_ROLLED_LABEL)))
+            .orElse(false);
+  }
+
   static boolean hasReadyServer(V1Pod pod) {
     return Optional.ofNullable(pod).map(PodHelper::hasReadyStatus).orElse(false);
   }