Revert to use of replaceDomain and remove status subresource from CRD

Author: rjeberhard

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

@@ -682,14 +682,10 @@ public NextAction apply(Packet packet) {
   private static NextAction doDomainUpdate(
       Domain dom, DomainPresenceInfo info, Packet packet, Step conflictStep, Step next) {
     V1ObjectMeta meta = dom.getMetadata();
-
-    // remove spec
-    dom.setSpec(null);
-
     NextAction na = new NextAction();
     na.invoke(
         new CallBuilder()
-            .replaceDomainStatusAsync(
+            .replaceDomainAsync(
                 meta.getName(),
                 meta.getNamespace(),
                 dom,
@@ -707,8 +703,9 @@ public NextAction onFailure(Packet packet, CallResponse<Domain> callResponse) {
 
                   @Override
                   public NextAction onSuccess(Packet packet, CallResponse<Domain> callResponse) {
-                    // Do not set domain on info since status update is a PUT
-                    // info.setDomain(callResponse.getResult());
+                    // Update info only if using replaceDomain
+                    // Skip, if we switch to using replaceDomainStatus
+                    info.setDomain(callResponse.getResult());
                     return doNext(packet);
                   }
                 }),

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

@@ -17,7 +17,6 @@
 import io.kubernetes.client.models.V1beta1CustomResourceValidation;
 import io.kubernetes.client.models.V1beta1JSONSchemaProps;
 import java.util.Collections;
-import java.util.HashMap;
 import oracle.kubernetes.json.SchemaGenerator;
 import oracle.kubernetes.operator.KubernetesConstants;
 import oracle.kubernetes.operator.LabelConstants;
@@ -104,8 +103,9 @@ static V1beta1CustomResourceDefinitionSpec createSpec(KubernetesVersion version)
                 .scale(
                     new V1beta1CustomResourceSubresourceScale()
                         .specReplicasPath(".spec.replicas")
-                        .statusReplicasPath(".status.replicas"))
-                .status(new HashMap<String, Object>()));
+                        .statusReplicasPath(".status.replicas")));
+        // Remove status for now because seeing status not updated on some k8s environments
+        // .status(new HashMap<String, Object>()));
       }
       return spec;
     }
@@ -251,7 +251,8 @@ public boolean isOutdatedCRD(
       return actual.getSpec().getVersion().equals("v1")
           || (actual.getSpec().getVersion().equals("v2")
               && (getSchemaValidation(actual) == null
-                  || !getSchemaValidation(expected).equals(getSchemaValidation(actual))));
+                  || !getSchemaValidation(expected).equals(getSchemaValidation(actual))
+                  || !getSchemaSubresources(expected).equals(getSchemaSubresources(actual))));
       // Similarly, we will later want to check:
       // VersionHelper.matchesResourceVersion(existingCRD.getMetadata(), DEFAULT_OPERATOR_VERSION)
     }
@@ -262,5 +263,13 @@ private V1beta1JSONSchemaProps getSchemaValidation(V1beta1CustomResourceDefiniti
       }
       return null;
     }
+
+    private V1beta1CustomResourceSubresources getSchemaSubresources(
+        V1beta1CustomResourceDefinition crd) {
+      if (crd != null && crd.getSpec() != null) {
+        return crd.getSpec().getSubresources();
+      }
+      return null;
+    }
   }
 }

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

@@ -69,7 +69,7 @@ String getPodReplacedMessageKey() {
 
   @Override
   void expectStepsAfterCreation() {
-    expectReplaceDomainStatus();
+    expectReplaceDomain();
   }
 
   @Override
@@ -85,6 +85,14 @@ private void expectReplaceDomainStatus() {
         .returning(new Domain());
   }
 
+  private void expectReplaceDomain() {
+    testSupport
+        .createCannedResponse("replaceDomain")
+        .withNamespace(NS)
+        .ignoringBody()
+        .returning(new Domain());
+  }
+
   @Override
   V1Pod createPodModel() {
     return new V1Pod().metadata(createPodMetadata()).spec(createPodSpec());