Owls102321 - provide more details in POD_CYCLE_STARTING event message (#3440)

* Add cycle pod reason when it is due to dynamic update

Author: doxiao

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

@@ -91,6 +91,7 @@
 import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE_SUCCESS;
 import static oracle.kubernetes.operator.helpers.AnnotationHelper.SHA256_ANNOTATION;
 import static oracle.kubernetes.operator.helpers.CompatibilityCheck.CompatibilityScope.DOMAIN;
+import static oracle.kubernetes.operator.helpers.CompatibilityCheck.CompatibilityScope.POD;
 import static oracle.kubernetes.operator.helpers.CompatibilityCheck.CompatibilityScope.UNKNOWN;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_ROLL_STARTING;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.POD_CYCLE_STARTING;
@@ -689,6 +690,14 @@ protected String getReasonToRecycle(V1Pod currentPod, CompatibilityScope scope)
     return compatibility.getScopedIncompatibility(scope);
   }
 
+  protected String getReasonToRecycle(V1Pod pod) {
+    String message = getReasonToRecycle(pod, POD);
+    if (message == null || message.length() == 0) {
+      message = getDomainIncompatibility(pod);
+    }
+    return message;
+  }
+
   private ResponseStep<V1Pod> createResponse(Step next) {
     return new CreateResponseStep(next);
   }
@@ -1199,7 +1208,7 @@ public NextAction apply(Packet packet) {
     }
 
     private Step createCyclePodEventStep(Step next) {
-      String reason = Optional.ofNullable(message).orElse(getReasonToRecycle(pod, CompatibilityScope.POD));
+      String reason = Optional.ofNullable(message).orElse(getReasonToRecycle(pod));
       LOGGER.info(
           MessageKeys.CYCLING_POD,
           Objects.requireNonNull(pod.getMetadata()).getName(),

operator/src/test/java/oracle/kubernetes/operator/helpers/AdminPodHelperTest.java

@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import io.kubernetes.client.openapi.models.V1Container;
 import io.kubernetes.client.openapi.models.V1EmptyDirVolumeSource;
@@ -18,6 +19,7 @@
 import io.kubernetes.client.openapi.models.V1Volume;
 import io.kubernetes.client.openapi.models.V1VolumeMount;
 import oracle.kubernetes.operator.DomainStatusUpdater;
+import oracle.kubernetes.operator.IntrospectorConfigMapConstants;
 import oracle.kubernetes.operator.KubernetesConstants;
 import oracle.kubernetes.operator.LabelConstants;
 import oracle.kubernetes.operator.calls.FailureStatusSourceException;
@@ -26,8 +28,13 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.ServerConfigurator;
+import oracle.kubernetes.weblogic.domain.model.Configuration;
+import oracle.kubernetes.weblogic.domain.model.Model;
+import oracle.kubernetes.weblogic.domain.model.OnlineUpdate;
 import org.junit.jupiter.api.Test;
 
+import static oracle.kubernetes.operator.EventConstants.ROLL_REASON_WEBLOGIC_CONFIGURATION_CHANGED;
+import static oracle.kubernetes.operator.ProcessingConstants.MII_DYNAMIC_UPDATE;
 import static oracle.kubernetes.operator.WebLogicConstants.ADMIN_STATE;
 import static oracle.kubernetes.operator.WebLogicConstants.RUNNING_STATE;
 import static oracle.kubernetes.operator.helpers.DomainIntrospectorJobTest.TEST_VOLUME_NAME;
@@ -858,6 +865,29 @@ void whenDomainHomeChanged_generateExpectedLogMessage()
     assertThat(logRecords, containsInfo(getCyclePodKey()));
   }
 
+  @Test
+  void whenDMIIDynamicUpdateNull_podCycleEventCreatedWithCorrectMessage() {
+    initializeExistingPod();
+    testSupport.getPacket().put(MII_DYNAMIC_UPDATE, "abcd");
+    testSupport.getPacket().put(IntrospectorConfigMapConstants.DOMAINZIP_HASH, "1234");
+    setOnlineUpdate(true);
+    testSupport.runSteps(getStepFactory(), terminalStep);
+    logRecords.clear();
+
+    assertThat(
+        "Expected Event " + POD_CYCLE_STARTING + " expected with expected message not found",
+        getExpectedEventMessage(POD_CYCLE_STARTING), stringContainsInOrder(ROLL_REASON_WEBLOGIC_CONFIGURATION_CHANGED));
+  }
+
+  private void setOnlineUpdate(boolean enabled) {
+    Configuration config = Optional.ofNullable(getDomain().getSpec().getConfiguration()).orElse(new Configuration());
+
+    Model model = Optional.ofNullable(config.getModel()).orElse(new Model());
+
+    OnlineUpdate update = Optional.ofNullable(model.getOnlineUpdate()).orElse(new OnlineUpdate());
+    update.setEnabled(enabled);
+  }
+
   private V1Pod createTestPodModel() {
     return new V1Pod().metadata(createPodMetadata()).spec(createPodSpec());
   }