owls-104622 domain status cluster condition Complete type is always True when the cluster replicas changed to 0 (#3754)

* Cluster Completed condition should be False until servers are shut down

* re-enable domain status condition check

* calls createClusterResourceStatusUpdaterStep when doamin stautus update succeeded

Author: alai8

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItRetryImprovementMisc.java

@@ -342,10 +342,9 @@ void testClusterReplicasToZero() {
     checkDomainStatusConditionTypeHasExpectedStatus(shortRetryPolicy, domainUid, domainNamespace,
         DOMAIN_STATUS_CONDITION_COMPLETED_TYPE, "False", DOMAIN_VERSION);
 
-    // Enable this check when the bug is fixed
     // check the cluster status condition Complete becomes false
-    //checkDomainStatusClusterConditionTypeHasExpectedStatus(shortRetryPolicy, domainUid, domainNamespace,
-    //    clusterName, DOMAIN_STATUS_CONDITION_COMPLETED_TYPE, "False", DOMAIN_VERSION);
+    checkDomainStatusClusterConditionTypeHasExpectedStatus(shortRetryPolicy, domainUid, domainNamespace,
+        clusterName, DOMAIN_STATUS_CONDITION_COMPLETED_TYPE, "False", DOMAIN_VERSION);
 
     // verify Cluster status condition Available becomes false and stay false when the server pod is deleting
     checkDomainStatusClusterConditionTypeHasExpectedStatus(withQuickRetryPolicy, domainUid, domainNamespace,

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

@@ -135,7 +135,7 @@ public interface StepWithRetryCount {
    * @return the new step
    */
   public static Step createStatusUpdateStep(Step next) {
-    return new StatusUpdateStep(createClusterResourceStatusUpdaterStep(next));
+    return new StatusUpdateStep(next);
   }
 
 
@@ -360,7 +360,7 @@ public NextAction onSuccess(Packet packet, CallResponse<DomainResource> callResp
       if (callResponse.getResult() != null) {
         packet.getSpi(DomainPresenceInfo.class).setDomain(callResponse.getResult());
       }
-      return doNext(packet);
+      return doNext(createClusterResourceStatusUpdaterStep(getNext()), packet);
     }
 
     @Override
@@ -936,9 +936,15 @@ boolean hasTooManyReplicas() {
         }
 
         private boolean allIntendedClusterServersReady() {
-          return isClusterIntentionallyShutDown() || (allStartedClusterServersAreComplete()
+          return isClusterIntentionallyShutDown()
+              ? allNonStartedClusterServersAreShutdown()
+              : isClusterStartupCompleted();
+        }
+
+        private boolean isClusterStartupCompleted() {
+          return allStartedClusterServersAreComplete()
               && allNonStartedClusterServersAreShutdown()
-              && clusteredServersMarkedForRoll().isEmpty());
+              && clusteredServersMarkedForRoll().isEmpty();
         }
 
         private boolean allStartedClusterServersAreComplete() {

operator/src/test/java/oracle/kubernetes/operator/DomainStatusUpdateTestBase.java

@@ -1136,6 +1136,42 @@ void whenClusterIsIntentionallyShutdown_establishClusterCompletedConditionTrue()
     assertThat(completedCondition.getStatus(), equalTo(TRUE));
   }
 
+  @Test
+  void whenClusterIsIntentionallyShutdown_serverShuttingDown_establishClusterCompletedConditionFalse() {
+    configureDomain().configureCluster(info, "cluster1").withReplicas(0).withMaxUnavailable(1);
+    defineScenario().withDynamicCluster("cluster1", 0, 1)
+        .notStarting("ms1")
+        .withServersReachingState(SHUTTING_DOWN_STATE, "ms1")
+        .build();
+    info.getReferencedClusters().forEach(testSupport::defineResources);
+
+    updateDomainStatus();
+
+    ClusterStatus clusterStatus = getClusterStatus();
+    assertThat(clusterStatus.getConditions().size(), equalTo(2));
+    ClusterCondition completedCondition = clusterStatus.getConditions().get(1);
+    assertThat(completedCondition.getType(), equalTo(ClusterConditionType.COMPLETED));
+    assertThat(completedCondition.getStatus(), equalTo(FALSE));
+  }
+
+  @Test
+  void whenClusterIsIntentionallyShutdown_serverShutDown_establishClusterCompletedConditionTrue() {
+    configureDomain().configureCluster(info, "cluster1").withReplicas(0).withMaxUnavailable(1);
+    defineScenario().withDynamicCluster("cluster1", 0, 1)
+        .notStarting("ms1")
+        .withServersReachingState(SHUTDOWN_STATE, "ms1")
+        .build();
+    info.getReferencedClusters().forEach(testSupport::defineResources);
+
+    updateDomainStatus();
+
+    ClusterStatus clusterStatus = getClusterStatus();
+    assertThat(clusterStatus.getConditions().size(), equalTo(2));
+    ClusterCondition completedCondition = clusterStatus.getConditions().get(1);
+    assertThat(completedCondition.getType(), equalTo(ClusterConditionType.COMPLETED));
+    assertThat(completedCondition.getStatus(), equalTo(TRUE));
+  }
+
   @Test
   void whenClusterHasTooManyReplicas_establishClusterCompletedConditionFalse() {
     configureDomain().configureCluster(info, "cluster1").withReplicas(20).withMaxUnavailable(1);