Correctly record time of annotation and adjust status earlier to prevent additional introspections

Author: rjeberhard

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

@@ -198,6 +198,22 @@ private boolean wasNotRolling() {
 
   }
 
+  public static Step createIncompleteBeforeIntrospectionStep() {
+    return new IncompleteBeforeIntrospectionStep();
+  }
+
+  public static class IncompleteBeforeIntrospectionStep extends DomainStatusUpdaterStep {
+
+    private IncompleteBeforeIntrospectionStep() {
+    }
+
+    @Override
+    void modifyStatus(DomainStatus status) {
+      status.addCondition(new DomainCondition(COMPLETED).withStatus(false));
+    }
+
+  }
+
   /**
    * Creates an asynchronous step to initialize the domain status, if needed, to indicate that the operator has
    * seen the domain and is now working on it.

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
@@ -82,7 +82,7 @@ private static boolean wasInspectionRun(Packet packet) {
       String time = packet.getValue(INTROSPECTION_TIME);
       if (time != null) {
         OffsetDateTime lastIntrospectionTime = OffsetDateTime.parse(time);
-        if (lastIntrospectionTime.isAfter(lastTransitionTime)) {
+        if (lastIntrospectionTime.isAfter(lastTransitionTime.minusSeconds(3))) {
           return true;
         }
       }

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2025, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.helpers;
@@ -353,7 +353,7 @@ public Result onSuccess(Packet packet, KubernetesApiResponse<V1ConfigMap> callRe
         } else if (isOutdated(existingMap)) {
           return doNext(replaceConfigMap(getNext()), packet);
         } else if (mustPatchCurrentMap(existingMap)) {
-          return doNext(patchCurrentMap(existingMap, getNext()), packet);
+          return doNext(patchCurrentMap(existingMap, packet, getNext()), packet);
         } else if (mustPatchImageHashInMap(existingMap, packet)) {
           return doNext(patchImageHashInCurrentMap(existingMap, packet, getNext()), packet);
         } else {
@@ -408,12 +408,20 @@ private ResponseStep<V1ConfigMap> createPatchResponseStep(Step next) {
         return new PatchResponseStep(next);
       }
 
-      private Step patchCurrentMap(V1ConfigMap currentMap, Step next) {
+      private Step patchCurrentMap(V1ConfigMap currentMap, Packet packet, Step next) {
         JsonPatchBuilder patchBuilder = Json.createPatchBuilder();
 
         if (labelsNotDefined(currentMap)) {
           patchBuilder.add("/metadata/labels", JsonValue.EMPTY_JSON_OBJECT);
         }
+
+        String introspectionTime = packet.getValue(INTROSPECTION_TIME);
+        if (introspectionTime != null) {
+          if (annotationsNotDefined(currentMap)) {
+            patchBuilder.add("/metadata/annotations", JsonValue.EMPTY_JSON_OBJECT);
+          }
+          patchBuilder.replace("/metadata/annotations/" + INTROSPECTION_TIME, introspectionTime);
+        }
 
         KubernetesUtils.addPatches(
             patchBuilder, "/metadata/labels/", getMapLabels(currentMap), getLabels());
@@ -428,6 +436,14 @@ private Step patchImageHashInCurrentMap(V1ConfigMap currentMap, Packet packet, S
 
         patchBuilder.add("/data/" + DOMAIN_INPUTS_HASH, (String)packet.get(DOMAIN_INPUTS_HASH));
 
+        String introspectionTime = packet.getValue(INTROSPECTION_TIME);
+        if (introspectionTime != null) {
+          if (annotationsNotDefined(currentMap)) {
+            patchBuilder.add("/metadata/annotations", JsonValue.EMPTY_JSON_OBJECT);
+          }
+          patchBuilder.replace("/metadata/annotations/" + INTROSPECTION_TIME, introspectionTime);
+        }
+
         return RequestBuilder.CM.patch(
             namespace, name, V1Patch.PATCH_FORMAT_JSON_PATCH,
             new V1Patch(patchBuilder.build().toString()), createPatchResponseStep(next));
@@ -436,6 +452,10 @@ private Step patchImageHashInCurrentMap(V1ConfigMap currentMap, Packet packet, S
       private boolean labelsNotDefined(V1ConfigMap currentMap) {
         return Objects.requireNonNull(currentMap.getMetadata()).getLabels() == null;
       }
+
+      private boolean annotationsNotDefined(V1ConfigMap currentMap) {
+        return Objects.requireNonNull(currentMap.getMetadata()).getAnnotations() == null;
+      }
     }
 
     private class CreateResponseStep extends ResponseStep<V1ConfigMap> {

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

@@ -35,6 +35,7 @@
 import io.kubernetes.client.util.generic.options.DeleteOptions;
 import io.kubernetes.client.util.generic.options.ListOptions;
 import oracle.kubernetes.common.logging.MessageKeys;
+import oracle.kubernetes.operator.DomainStatusUpdater;
 import oracle.kubernetes.operator.IntrospectionStatus;
 import oracle.kubernetes.operator.IntrospectorConfigMapConstants;
 import oracle.kubernetes.operator.LabelConstants;
@@ -423,6 +424,7 @@ private Step cleanUpAndReintrospect(Step next) {
     private Step createIntrospectionSteps(Step next) {
       return Step.chain(
               readExistingIntrospectorConfigMap(),
+              DomainStatusUpdater.createIncompleteBeforeIntrospectionStep(),
               createNewJob(),
               processExistingIntrospectorJob(next));
     }