Add status validation to CRD

Author: rjeberhard

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

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -8,7 +8,14 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import io.kubernetes.client.models.*;
+import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1beta1CustomResourceDefinition;
+import io.kubernetes.client.models.V1beta1CustomResourceDefinitionNames;
+import io.kubernetes.client.models.V1beta1CustomResourceDefinitionSpec;
+import io.kubernetes.client.models.V1beta1CustomResourceSubresourceScale;
+import io.kubernetes.client.models.V1beta1CustomResourceSubresources;
+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;
@@ -23,6 +30,7 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
+import oracle.kubernetes.weblogic.domain.v2.DomainStatus;
 
 /** Helper class to ensure Domain CRD is created */
 public class CRDHelper {
@@ -116,9 +124,16 @@ static V1beta1CustomResourceValidation createSchemaValidation() {
 
     static V1beta1JSONSchemaProps createOpenAPIV3Schema() {
       Gson gson = new Gson();
-      JsonElement jsonElement = gson.toJsonTree(createSchemaGenerator().generate(DomainSpec.class));
-      V1beta1JSONSchemaProps spec = gson.fromJson(jsonElement, V1beta1JSONSchemaProps.class);
-      return new V1beta1JSONSchemaProps().putPropertiesItem("spec", spec);
+      JsonElement jsonElementSpec =
+          gson.toJsonTree(createSchemaGenerator().generate(DomainSpec.class));
+      V1beta1JSONSchemaProps spec = gson.fromJson(jsonElementSpec, V1beta1JSONSchemaProps.class);
+      JsonElement jsonElementStatus =
+          gson.toJsonTree(createSchemaGenerator().generate(DomainStatus.class));
+      V1beta1JSONSchemaProps status =
+          gson.fromJson(jsonElementStatus, V1beta1JSONSchemaProps.class);
+      return new V1beta1JSONSchemaProps()
+          .putPropertiesItem("spec", spec)
+          .putPropertiesItem("status", status);
     }
 
     static SchemaGenerator createSchemaGenerator() {

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

@@ -210,7 +210,7 @@ private boolean hasSchemaVerification(V1beta1CustomResourceDefinition actualBody
       if (validation == null) return false;
 
       V1beta1JSONSchemaProps openAPIV3Schema = validation.getOpenAPIV3Schema();
-      if (openAPIV3Schema == null || openAPIV3Schema.getProperties().size() != 1) return false;
+      if (openAPIV3Schema == null || openAPIV3Schema.getProperties().size() != 2) return false;
 
       V1beta1JSONSchemaProps spec = openAPIV3Schema.getProperties().get("spec");
       if (spec == null || spec.getProperties().isEmpty()) return false;