Read of existing situ config map only on up flow

Author: rjeberhard

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

@@ -687,10 +687,7 @@ public StartPlanStep(DomainPresenceInfo info, Step next) {
 
     @Override
     public NextAction apply(Packet packet) {
-      Step strategy =
-          Step.chain(
-              ConfigMapHelper.readExistingSituConfigMap(info.getNamespace(), info.getDomainUID()),
-              new RegisterStep(info, getNext()));
+      Step strategy = getNext();
       if (!info.isPopulated()) {
         strategy = Step.chain(readExistingPods(info), readExistingServices(info), strategy);
       }
@@ -890,12 +887,17 @@ static Step createDomainUpPlan(DomainPresenceInfo info) {
                     info,
                     new DomainStatusStep(info, bringAdminServerUp(info, managedServerStrategy)))));
 
-    return new UpHeadStep(
-        info,
-        DomainStatusUpdater.createProgressingStep(
-            DomainStatusUpdater.INSPECTING_DOMAIN_PROGRESS_REASON,
-            true,
-            DomainPresenceStep.createDomainPresenceStep(dom, strategy, managedServerStrategy)));
+    strategy =
+        new UpHeadStep(
+            info,
+            DomainStatusUpdater.createProgressingStep(
+                DomainStatusUpdater.INSPECTING_DOMAIN_PROGRESS_REASON,
+                true,
+                DomainPresenceStep.createDomainPresenceStep(dom, strategy, managedServerStrategy)));
+
+    return Step.chain(
+        ConfigMapHelper.readExistingSituConfigMap(info.getNamespace(), info.getDomainUID()),
+        new RegisterStep(info, strategy));
   }
 
   static Step createDomainDownPlan(DomainPresenceInfo info) {

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

@@ -147,7 +147,11 @@ public void whenNoPreexistingDomains_createEmptyDomainPresenceInfoMap() {
   }
 
   private void readExistingResources() {
-    createCannedListDomainResponses();
+    readExistingResources(false);
+  }
+
+  private void readExistingResources(boolean isDelete) {
+    createCannedListDomainResponses(isDelete);
     testSupport.runStepsToCompletion(Main.readExistingResources("operator", NS));
   }
 
@@ -332,7 +336,7 @@ private V1Event createEventResource(String uid, String serverName, String messag
   }
 
   @SuppressWarnings("unchecked")
-  private void createCannedListDomainResponses() {
+  private void createCannedListDomainResponses(boolean isDelete) {
     testSupport.createCannedResponse("listDomain").withNamespace(NS).returning(domains);
     testSupport
         .createCannedResponse("listService")
@@ -360,11 +364,13 @@ private void createCannedListDomainResponses() {
         .withName(DOMAIN_CONFIG_MAP_NAME)
         .ignoringBody()
         .returning(domainConfigMap);
-    testSupport
-        .createCannedResponse("readConfigMap")
-        .withNamespace(NS)
-        .withName(UID + INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX)
-        .returning(createEmptyConfigMap());
+    if (!isDelete) {
+      testSupport
+          .createCannedResponse("readConfigMap")
+          .withNamespace(NS)
+          .withName(UID + INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX)
+          .returning(createEmptyConfigMap());
+    }
   }
 
   private DomainList createEmptyDomainList() {
@@ -467,7 +473,7 @@ public void whenStrandedResourcesExist_removeThem() {
 
     isNamespaceStopping.get(NS).set(false);
 
-    readExistingResources();
+    readExistingResources(true);
 
     testSupport.verifyAllDefinedResponsesInvoked();
   }