Merge branch 'fix-generation-status-update-main' into 'main'

Fix domain status observedGeneration not updated when mii online update

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

Author: rjeberhard

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

@@ -85,6 +85,7 @@
 import static oracle.kubernetes.operator.ProcessingConstants.DOMAIN_TOPOLOGY;
 import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE;
 import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE_RESTART_REQUIRED;
+import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE_SUCCESS;
 import static oracle.kubernetes.operator.ProcessingConstants.SERVER_HEALTH_MAP;
 import static oracle.kubernetes.operator.ProcessingConstants.SERVER_STATE_MAP;
 import static oracle.kubernetes.operator.WebLogicConstants.RUNNING_STATE;
@@ -424,10 +425,12 @@ static class DomainStatusUpdaterContext {
     private DomainStatus newStatus;
     private final List<EventData> newEvents = new ArrayList<>();
     final boolean endOfProcessing;
+    private Packet packet;
 
     DomainStatusUpdaterContext(Packet packet, DomainStatusUpdaterStep domainStatusUpdaterStep) {
       info = DomainPresenceInfo.fromPacket(packet).orElseThrow();
       isMakeRight = MakeRightDomainOperation.isMakeRight(packet);
+      this.packet = packet;
       this.domainStatusUpdaterStep = domainStatusUpdaterStep;
       endOfProcessing = (Boolean) packet.getOrDefault(ProcessingConstants.END_OF_PROCESSING, Boolean.FALSE);
     }
@@ -538,7 +541,10 @@ Step createUpdateSteps(Step next) {
       if (!isStatusUnchanged()) {
         result.add(createDomainStatusReplaceStep());
       } else {
-        if (endOfProcessing && isMakeRight) {
+        boolean successFullDynamicUpdate = MII_DYNAMIC_UPDATE_SUCCESS.equals(packet.get(MII_DYNAMIC_UPDATE))
+                || MII_DYNAMIC_UPDATE_RESTART_REQUIRED.equals(packet.get(MII_DYNAMIC_UPDATE));
+
+        if ((endOfProcessing && isMakeRight) || successFullDynamicUpdate) {
           Optional.ofNullable(createDomainStatusObservedGenerationReplaceStep()).ifPresent(result::add);
         }
       }