Add schema to CRD

Author: russgold

model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

@@ -25,7 +25,7 @@ public interface KubernetesConstants {
   String DOMAIN_SINGULAR = "domain";
   String DOMAIN_SHORT = "dom";
 
-  String DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = "true";
+  boolean DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = true;
 
   String CONTAINER_NAME = "weblogic-server";
 

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Domain.java

@@ -314,7 +314,7 @@ public String getLogHome() {
     return spec.getLogHome();
   }
 
-  public String getIncludeServerOutInPodLog() {
+  public boolean isIncludeServerOutInPodLog() {
     return spec.getIncludeServerOutInPodLog();
   }
 

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -10,25 +10,19 @@
 import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.models.V1LocalObjectReference;
 import io.kubernetes.client.models.V1SecretReference;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import oracle.kubernetes.json.Description;
 import oracle.kubernetes.operator.KubernetesConstants;
-import oracle.kubernetes.operator.VersionConstants;
 import oracle.kubernetes.weblogic.domain.EffectiveConfigurationFactory;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /** DomainSpec is a description of a domain. */
-@SuppressWarnings("NullableProblems")
 public class DomainSpec extends BaseConfiguration {
 
   /** The pattern for computing the default persistent volume claim name. */
@@ -114,7 +108,8 @@ public class DomainSpec extends BaseConfiguration {
   /** Whether to include the server .out file to the pod's stdout. Default is true. */
   @SerializedName("includeServerOutInPodLog")
   @Expose
-  private String includeServerOutInPodLog;
+  @Description("If true (the default), the server .out file will be included in the pod's stdout")
+  private Boolean includeServerOutInPodLog;
 
   /**
    * The WebLogic Docker image.
@@ -175,7 +170,7 @@ public class DomainSpec extends BaseConfiguration {
   @Expose
   @Description(
       "Flag indicating whether the domain home is part of the image. Default value is true. ")
-  private boolean domainHomeInImage = true;
+  private Boolean domainHomeInImage;
 
   /** The definition of the storage used for this domain. */
   @SerializedName("storage")
@@ -236,7 +231,7 @@ public class DomainSpec extends BaseConfiguration {
   @Description("Configuration for the clusters")
   protected Map<String, Cluster> clusters = new HashMap<>();
 
-  public AdminServer getOrCreateAdminServer(String adminServerName) {
+  AdminServer getOrCreateAdminServer(String adminServerName) {
     if (adminServer != null) return adminServer;
 
     return createAdminServer(adminServerName);
@@ -249,14 +244,11 @@ private AdminServer createAdminServer(String adminServerName) {
     return adminServer;
   }
 
+  @SuppressWarnings("unused")
   EffectiveConfigurationFactory getEffectiveConfigurationFactory(String resourceVersionLabel) {
     return new V2EffectiveConfigurationFactory();
   }
 
-  private boolean isVersion2Specified(String resourceVersionLabel) {
-    return VersionConstants.DOMAIN_V2.equals(resourceVersionLabel);
-  }
-
   /**
    * Domain unique identifier. Must be unique across the Kubernetes cluster. (Required)
    *
@@ -321,7 +313,7 @@ public DomainSpec withDomainName(String domainName) {
    * @since 2.0
    * @return domain home
    */
-  public String getDomainHome() {
+  String getDomainHome() {
     return domainHome;
   }
 
@@ -346,33 +338,6 @@ public DomainSpec withImage(String image) {
     return this;
   }
 
-  /**
-   * The image pull policy for the WebLogic Docker image. Legal values are Always, Never and
-   * IfNotPresent.
-   *
-   * <p>Defaults to Always if image ends in :latest, IfNotPresent otherwise.
-   *
-   * <p>More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
-   *
-   * @param imagePullPolicy image pull policy
-   * @return this
-   */
-  public DomainSpec withImagePullPolicy(String imagePullPolicy) {
-    setImagePullPolicy(imagePullPolicy);
-    return this;
-  }
-
-  /**
-   * The name of the secret used to authenticate a request for an image pull.
-   *
-   * <p>More info:
-   * https://kubernetes.io/docs/concepts/containers/images/#referring-to-an-imagepullsecrets-on-a-pod
-   */
-  public DomainSpec withImagePullSecretName(String imagePullSecretName) {
-    setImagePullSecret(new V1LocalObjectReference().name(imagePullSecretName));
-    return this;
-  }
-
   public V1SecretReference getAdminSecret() {
     return adminSecret;
   }
@@ -398,7 +363,7 @@ public String getAsName() {
     return asName;
   }
 
-  public void setAsName(String asName) {
+  private void setAsName(String asName) {
     this.asName = asName;
   }
 
@@ -486,11 +451,6 @@ public void setLogHome(String logHome) {
     this.logHome = logHome;
   }
 
-  public DomainSpec withLogHome(String logHome) {
-    this.logHome = logHome;
-    return this;
-  }
-
   /**
    * Log home enabled
    *
@@ -520,20 +480,12 @@ public void setLogHomeEnabled(boolean logHomeEnabled) {
    * @return whether server .out should be included in pod's stdout.
    * @since 2.0
    */
-  public String getIncludeServerOutInPodLog() {
-    return Optional.ofNullable(getConfiguredIncludeServerOutInPodLog())
+  boolean getIncludeServerOutInPodLog() {
+    return Optional.ofNullable(includeServerOutInPodLog)
         .orElse(KubernetesConstants.DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG);
   }
 
-  String getConfiguredIncludeServerOutInPodLog() {
-    return includeServerOutInPodLog;
-  }
-
-  public void setIncludeServerOutInPodLog(String includeServerOutInPodLog) {
-    this.includeServerOutInPodLog = includeServerOutInPodLog;
-  }
-
-  public DomainSpec withIncludeServerOutInPodLog(String includeServerOutInPodLog) {
+  public DomainSpec withIncludeServerOutInPodLog(boolean includeServerOutInPodLog) {
     this.includeServerOutInPodLog = includeServerOutInPodLog;
     return this;
   }
@@ -544,26 +496,17 @@ public DomainSpec withIncludeServerOutInPodLog(String includeServerOutInPodLog)
    * @return true or false
    * @since 2.0
    */
-  public boolean isDomainHomeInImage() {
-    return domainHomeInImage;
-  }
-
-  /** @param domainHomeInImage */
-  public void setDomainHomeInImage(boolean domainHomeInImage) {
-    this.domainHomeInImage = domainHomeInImage;
+  boolean isDomainHomeInImage() {
+    return Optional.ofNullable(domainHomeInImage).orElse(true);
   }
 
   /**
-   * Replicas is the desired number of managed servers running in each WebLogic cluster that is not
-   * configured in clusters. Provided so that administrators can scale the Domain resource.
+   * Specifies whether the domain home is stored in the image
    *
-   * @deprecated use {@link Domain#getReplicaCount(String)} to obtain the effective setting.
-   * @return replicas
+   * @param domainHomeInImage true if the domain home is in the image
    */
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  @Deprecated
-  public Integer getReplicas() {
-    return replicas != null ? replicas : 0;
+  public void setDomainHomeInImage(boolean domainHomeInImage) {
+    this.domainHomeInImage = domainHomeInImage;
   }
 
   /**
@@ -572,7 +515,6 @@ public Integer getReplicas() {
    *
    * @param replicas replicas
    */
-  @SuppressWarnings("deprecation")
   public void setReplicas(Integer replicas) {
     this.replicas = replicas;
   }
@@ -584,7 +526,6 @@ public void setReplicas(Integer replicas) {
    * @param replicas replicas
    * @return this
    */
-  @SuppressWarnings("deprecation")
   public DomainSpec withReplicas(Integer replicas) {
     this.replicas = replicas;
     return this;
@@ -609,11 +550,11 @@ public DomainStorage getStorage() {
   }
 
   @Nullable
-  public String getConfigOverrides() {
+  String getConfigOverrides() {
     return configOverrides;
   }
 
-  public void setConfigOverrides(@Nullable String overridess) {
+  void setConfigOverrides(@Nullable String overridess) {
     this.configOverrides = overridess;
   }
 
@@ -627,7 +568,7 @@ private boolean hasConfigOverrideSecrets() {
   }
 
   @Nullable
-  public List<String> getConfigOverrideSecrets() {
+  List<String> getConfigOverrideSecrets() {
     if (hasConfigOverrideSecrets()) return configOverrideSecrets;
     else return Collections.emptyList();
   }
@@ -636,11 +577,6 @@ public void setConfigOverrideSecrets(@Nullable List<String> overridesSecretNames
     this.configOverrideSecrets = overridesSecretNames;
   }
 
-  public DomainSpec withConfigOverrideSecrets(@Nullable List<String> overridesSecretNames) {
-    this.configOverrideSecrets = overridesSecretNames;
-    return this;
-  }
-
   /**
    * Returns the name of the persistent volume claim for the logs and PV-based domain.
    *
@@ -770,15 +706,15 @@ private boolean hasReplicaCount(Cluster cluster) {
     return cluster != null && cluster.getReplicas() != null;
   }
 
-  public AdminServer getAdminServer() {
+  private AdminServer getAdminServer() {
     return Optional.ofNullable(adminServer).orElse(AdminServer.NULL_ADMIN_SERVER);
   }
 
-  public void setAdminServer(AdminServer adminServer) {
+  private void setAdminServer(AdminServer adminServer) {
     this.adminServer = adminServer;
   }
 
-  public Map<String, ManagedServer> getManagedServers() {
+  Map<String, ManagedServer> getManagedServers() {
     return managedServers;
   }
 

model/src/test/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Test.java

@@ -9,29 +9,13 @@
 import static oracle.kubernetes.operator.KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;
 import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_ALWAYS;
 import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_NEVER;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
 import com.google.gson.GsonBuilder;
 import io.kubernetes.client.custom.Quantity;
-import io.kubernetes.client.models.V1Capabilities;
-import io.kubernetes.client.models.V1EnvVar;
-import io.kubernetes.client.models.V1HostPathVolumeSource;
-import io.kubernetes.client.models.V1PodSecurityContext;
-import io.kubernetes.client.models.V1ResourceRequirements;
-import io.kubernetes.client.models.V1SELinuxOptions;
-import io.kubernetes.client.models.V1SecurityContext;
-import io.kubernetes.client.models.V1Sysctl;
-import io.kubernetes.client.models.V1Volume;
-import io.kubernetes.client.models.V1VolumeMount;
+import io.kubernetes.client.models.*;
 import java.io.IOException;
 import java.util.Map;
 import oracle.kubernetes.weblogic.domain.AdminServerConfigurator;
@@ -805,6 +789,34 @@ public void whenDomainReadFromYaml_unconfiguredServerHasDomainDefaults() throws
     assertThat(serverSpec.shouldStart(1), is(true));
   }
 
+  @Test
+  public void whenDomainReadFromYamlWithNoSetting_defaultsToDomainHomeInImage() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML);
+
+    assertThat(domain.isDomainHomeInImage(), is(true));
+  }
+
+  @Test
+  public void whenDomainReadFromYaml_domainHomeInImageIsDisabled() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_2);
+
+    assertThat(domain.isDomainHomeInImage(), is(false));
+  }
+
+  @Test
+  public void whenDomainReadFromYamlWithNoSetting_defaultsToServerOutInPodLog() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML);
+
+    assertThat(domain.isIncludeServerOutInPodLog(), is(true));
+  }
+
+  @Test
+  public void whenDomainReadFromYaml_serverOutInPodLogIsSet() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_2);
+
+    assertThat(domain.isIncludeServerOutInPodLog(), is(false));
+  }
+
   @Test
   public void whenDomainReadFromYaml_unconfiguredClusteredServerHasDomainDefaults()
       throws IOException {
@@ -1238,7 +1250,7 @@ public void whenDuplicateVolumeMountsConfiguredOnMultipleLevels_useCombination()
   }
 
   @Test
-  public void whenDefaultConfiguration_domainHomeInImage() {
+  public void whenDefaultConfiguration_domainHomeInImageIsTrue() {
     configureDomain(domain);
 
     assertThat(domain.getSpec().isDomainHomeInImage(), is(true));

model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-2.yaml

@@ -30,6 +30,9 @@ spec:
   # to be started to get to the cluster's replica count..
   serverStartPolicy: NEVER
 
+  domainHomeInImage: false
+  includeServerOutInPodLog: false
+
   # Specifies the number of replicas for any clusters which do not specify their own count:
   replicas: 3