Merge branch 'fix-readinessfailed-and-notrolling-update-main' into 'm…

…ain' The is a forward port from 4.2 when the readiness probe has a permanent... See merge request weblogic-cloud/weblogic-kubernetes-operator!4866
oracle · Nov 13, 2024 · e132eec · e132eec
2 parents b40342d + 49768bf
commit e132eec
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java
@@ -116,6 +116,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::getAnnotations)
+            .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);
   }

diff --git a/operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java b/operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java
@@ -148,8 +148,9 @@ static class ManagedPodReadyStep extends Step {
       WlsDomainConfig domainTopology =
               (WlsDomainConfig) packet.get(ProcessingConstants.DOMAIN_TOPOLOGY);
       V1Pod managedPod = info.getServerPod(serverName);
-
-      if (managedPod == null || (!isPodReady(managedPod) && !isPodMarkedForShutdown(managedPod))) {
+      boolean isWaitingToRoll = PodHelper.isWaitingToRoll(managedPod);
+      if (managedPod == null || (!isPodReady(managedPod) && !isPodMarkedForShutdown(managedPod)
+              && !isWaitingToRoll)) {
         // requeue to wait for managed pod to be ready
         return doRequeue(packet);
       }

diff --git a/operator/src/main/java/oracle/kubernetes/operator/steps/ShutdownManagedServerStep.java b/operator/src/main/java/oracle/kubernetes/operator/steps/ShutdownManagedServerStep.java
@@ -85,7 +85,7 @@ public static Step createShutdownManagedServerStep(Step next, String serverName,
     V1Service service = getDomainPresenceInfo(packet).getServerService(serverName);
 
     String now = OffsetDateTime.now().toString();
-    if (service == null || !PodHelper.isReady(pod) || PodHelper.isFailed(pod)) {
+    if (service == null || !PodHelper.isReady(pod) || PodHelper.isFailed(pod) || PodHelper.isWaitingToRoll(pod)) {
       return doNext(PodHelper.annotatePodAsNeedingToShutdown(pod, now, getNext()), packet);
     }
     return doNext(