Support domain status detection in both directions

Author: rjeberhard

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

@@ -25,8 +25,10 @@
 import oracle.kubernetes.operator.calls.FailureStatusSource;
 import oracle.kubernetes.operator.calls.UnrecoverableErrorBuilder;
 import oracle.kubernetes.operator.helpers.CallBuilder;
+import oracle.kubernetes.operator.helpers.CrdHelper;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo.ServerStartupInfo;
+import oracle.kubernetes.operator.helpers.KubernetesVersion;
 import oracle.kubernetes.operator.helpers.PodHelper;
 import oracle.kubernetes.operator.helpers.ResponseStep;
 import oracle.kubernetes.operator.logging.LoggingFacade;
@@ -274,13 +276,10 @@ public NextAction onSuccess(Packet packet, CallResponse<Domain> callResponse) {
       // If the 3.0.0 operator updated the CRD to use status endpoint while this operator is running
       // then these domain replace calls will succeed, but the proposed domain status will have been
       // ignored. Check if the status on the returned domain is expected
-      if (!useDomainStatusEndpoint && !newStatus.equals(callResponse.getResult().getStatus())) {
-        // TEST
-        System.out.println("**** **** ****: Domain status update ignored; switching to status endpoint");
-
-        // FIXME: would be better to recheck CRD
-        Main.useDomainStatusEndpoint.set(true);
-        return doNext(createRetry(context, getNext()), packet);
+      if (callResponse.getResult() == null || !newStatus.equals(callResponse.getResult().getStatus())) {
+        LOGGER.info(MessageKeys.DOMAIN_STATUS_IGNORED);
+        return doNext(CrdHelper.createDomainCrdStep(packet.getSpi(KubernetesVersion.class),
+            createRetry(context, getNext())), packet);
       }
       /* END-2.6.0-ONLY */
       packet.getSpi(DomainPresenceInfo.class).setDomain(callResponse.getResult());

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

@@ -557,9 +557,7 @@ public NextAction onSuccess(
 
       /* MARKER-2.6.0-ONLY */
       private void checkForStatusSubresource(V1beta1CustomResourceDefinition existingCrd) {
-        if (existingCrd.getSpec().getSubresources().getStatus() != null) {
-          Main.useDomainStatusEndpoint.set(true);
-        }
+        Main.useDomainStatusEndpoint.set(existingCrd.getSpec().getSubresources().getStatus() != null);
       }
       /* END-2.6.0-ONLY */
 

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -14,6 +14,7 @@ public class MessageKeys {
   public static final String OPERATOR_SHUTTING_DOWN = "WLSKO-0005";
   public static final String EXCEPTION = "WLSKO-0006";
   public static final String CREATING_CRD = "WLSKO-0012";
+  public static final String DOMAIN_STATUS_IGNORED = "WLSKO-0013";
   public static final String LISTING_DOMAINS = "WLSKO-0014";
   public static final String SECRET_NOT_FOUND = "WLSKO-0018";
   public static final String RETRIEVING_SECRET = "WLSKO-0019";

operator/src/main/resources/Operator.properties

@@ -11,7 +11,7 @@ WLSKO-0009=Created Network Policy: {0}
 WLSKO-0010=Service Details: {0}
 WLSKO-0011=Creating Service in namespace {0} with details: {1}
 WLSKO-0012=Create Custom Resource Definition: {0}
-WLSKO-0013=
+WLSKO-0013=Domain status update ignored; rechecking CRD
 WLSKO-0014=Listing WebLogic Domains
 WLSKO-0015=WebLogic Domain information: {0}
 WLSKO-0016=There are {0} domains in namespace {1}