Work in progress

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainCondition.java

@@ -23,22 +23,27 @@ public class DomainCondition implements Comparable<DomainCondition> {
           + "Available, and Failed. Required.")
   @NotNull
   private final DomainConditionType type;
+
   @Description("Last time we probed the condition.")
   @SerializedName("lastProbeTime")
   @Expose
   private DateTime lastProbeTime;
+
   @Description("Last time the condition transitioned from one status to another.")
   @SerializedName("lastTransitionTime")
   @Expose
   private DateTime lastTransitionTime;
+
   @Description("Human-readable message indicating details about last transition.")
   @SerializedName("message")
   @Expose
   private String message;
+
   @Description("Unique, one-word, CamelCase reason for the condition's last transition.")
   @SerializedName("reason")
   @Expose
   private String reason;
+
   @Description("Status is the status of the condition. Can be True, False, Unknown. Required.")
   @SerializedName("status")
   @Expose

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

@@ -33,20 +33,14 @@
 @Description("DomainSpec is a description of a domain.")
 public class DomainSpec extends BaseConfiguration {
 
-  /**
-   * The configured clusters.
-   *
-   * @since 2.0
-   */
-  @Description("Configuration for the clusters.")
-  protected List<Cluster> clusters = new ArrayList<>();
   /** Domain unique identifier. Must be unique across the Kubernetes cluster. */
   @Description(
       "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required."
           + " Defaults to the value of metadata.name.")
   @Pattern("^[a-z0-9-.]{1,253}$")
   @SerializedName("domainUID")
   private String domainUid;
+
   /**
    * Domain home.
    *
@@ -57,6 +51,7 @@ public class DomainSpec extends BaseConfiguration {
           + " Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false."
           + " Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true.")
   private String domainHome;
+
   /**
    * Tells the operator whether the customer wants the server to be running. For non-clustered
    * servers - the operator will start it if the policy isn't NEVER. For clustered servers - the
@@ -70,6 +65,7 @@ public class DomainSpec extends BaseConfiguration {
       "The strategy for deciding whether to start a server. "
           + "Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.")
   private String serverStartPolicy;
+
   /**
    * Reference to secret containing WebLogic startup credentials username and password. Secret must
    * contain keys names 'username' and 'password'. Required.
@@ -81,6 +77,7 @@ public class DomainSpec extends BaseConfiguration {
   @Valid
   @NotNull
   private V1SecretReference webLogicCredentialsSecret;
+
   /**
    * The in-pod name of the directory to store the domain, node manager, server logs, and server
    * .out files in.
@@ -89,6 +86,7 @@ public class DomainSpec extends BaseConfiguration {
       "The in-pod name of the directory in which to store the domain, node manager, server logs, "
           + "and server  *.out files")
   private String logHome;
+
   /**
    * Whether the log home is enabled.
    *
@@ -99,9 +97,11 @@ public class DomainSpec extends BaseConfiguration {
           + "Defaults to true if domainHomeInImage is false. "
           + "Defaults to false if domainHomeInImage is true. ")
   private Boolean logHomeEnabled; // Boolean object, null if unspecified
+
   /** Whether to include the server .out file to the pod's stdout. Default is true. */
   @Description("If true (the default), the server .out file will be included in the pod's stdout.")
   private Boolean includeServerOutInPodLog;
+
   /**
    * The WebLogic Docker image.
    *
@@ -111,6 +111,7 @@ public class DomainSpec extends BaseConfiguration {
       "The WebLogic Docker image; required when domainHomeInImage is true; "
           + "otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3.")
   private String image;
+
   /**
    * The image pull policy for the WebLogic Docker image. Legal values are Always, Never and
    * IfNotPresent.
@@ -125,6 +126,7 @@ public class DomainSpec extends BaseConfiguration {
           + "Defaults to Always if image ends in :latest, IfNotPresent otherwise.")
   @EnumClass(ImagePullPolicy.class)
   private String imagePullPolicy;
+
   /**
    * The image pull secrets for the WebLogic Docker image.
    *
@@ -135,6 +137,7 @@ public class DomainSpec extends BaseConfiguration {
    */
   @Description("A list of image pull secrets for the WebLogic Docker image.")
   private List<V1LocalObjectReference> imagePullSecrets;
+
   /**
    * The desired number of running managed servers in each WebLogic cluster that is not explicitly
    * configured in a cluster specification.
@@ -143,6 +146,7 @@ public class DomainSpec extends BaseConfiguration {
       "The number of managed servers to run in any cluster that does not specify a replica count.")
   @Range(minimum = 0)
   private Integer replicas;
+
   /**
    * Whether the domain home is part of the image.
    *
@@ -151,27 +155,31 @@ public class DomainSpec extends BaseConfiguration {
   @Description(
       "True if this domain's home is defined in the Docker image for the domain. Defaults to true.")
   private Boolean domainHomeInImage;
+
   /**
    * The name of the Kubernetes config map used for optional WebLogic configuration overrides.
    *
    * @since 2.0
    */
   @Description("The name of the config map for optional WebLogic configuration overrides.")
   private String configOverrides;
+
   /**
    * A list of names of the Kubernetes secrets used in the WebLogic Configuration overrides.
    *
    * @since 2.0
    */
   @Description("A list of names of the secrets for optional WebLogic configuration overrides.")
   private List<String> configOverrideSecrets;
+
   /**
    * The configuration for the admin server.
    *
    * @since 2.0
    */
   @Description("Configuration for the Administration Server.")
   private AdminServer adminServer;
+
   /**
    * The configured managed servers.
    *
@@ -180,6 +188,14 @@ public class DomainSpec extends BaseConfiguration {
   @Description("Configuration for individual Managed Servers.")
   private List<ManagedServer> managedServers = new ArrayList<>();
 
+  /**
+   * The configured clusters.
+   *
+   * @since 2.0
+   */
+  @Description("Configuration for the clusters.")
+  protected List<Cluster> clusters = new ArrayList<>();
+
   /**
    * Adds a Cluster to the DomainSpec.
    *

model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerHealth.java

@@ -37,7 +37,7 @@ public class ServerHealth {
   @SerializedName("subsystems")
   @Expose
   @Valid
-  private List<SubsystemHealth> subsystems = new ArrayList<SubsystemHealth>();
+  private List<SubsystemHealth> subsystems = new ArrayList<>();
 
   /**
    * RFC 3339 date and time at which the server started.

model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerPod.java

@@ -15,14 +15,21 @@
 import javax.annotation.Nullable;
 import javax.validation.Valid;
 
+import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.custom.Quantity;
+import io.kubernetes.client.models.V1Affinity;
 import io.kubernetes.client.models.V1Capabilities;
 import io.kubernetes.client.models.V1Container;
 import io.kubernetes.client.models.V1EnvVar;
+import io.kubernetes.client.models.V1HostAlias;
 import io.kubernetes.client.models.V1HostPathVolumeSource;
+import io.kubernetes.client.models.V1LocalObjectReference;
+import io.kubernetes.client.models.V1PodDNSConfig;
+import io.kubernetes.client.models.V1PodReadinessGate;
 import io.kubernetes.client.models.V1PodSecurityContext;
 import io.kubernetes.client.models.V1ResourceRequirements;
 import io.kubernetes.client.models.V1SecurityContext;
+import io.kubernetes.client.models.V1Toleration;
 import io.kubernetes.client.models.V1Volume;
 import io.kubernetes.client.models.V1VolumeMount;
 import oracle.kubernetes.json.Description;
@@ -36,17 +43,12 @@
 class ServerPod extends KubernetesResource {
 
   private static final Comparator<V1EnvVar> ENV_VAR_COMPARATOR =
-      (a, b) -> {
-        return a.getName().compareTo(b.getName());
-      };
+      Comparator.comparing(V1EnvVar::getName);
   private static final Comparator<V1Volume> VOLUME_COMPARATOR =
-      (a, b) -> {
-        return a.getName().compareTo(b.getName());
-      };
+      Comparator.comparing(V1Volume::getName);
   private static final Comparator<V1VolumeMount> VOLUME_MOUNT_COMPARATOR =
-      (a, b) -> {
-        return a.getName().compareTo(b.getName());
-      };
+      Comparator.comparing(V1VolumeMount::getName);
+
   /**
    * Environment variables to pass while starting a server.
    *
@@ -55,6 +57,7 @@ class ServerPod extends KubernetesResource {
   @Valid
   @Description("A list of environment variables to add to a server.")
   private List<V1EnvVar> env = new ArrayList<>();
+
   /**
    * Defines the settings for the liveness probe. Any that are not specified will default to the
    * runtime liveness probe tuning settings.
@@ -63,6 +66,7 @@ class ServerPod extends KubernetesResource {
    */
   @Description("Settings for the liveness probe associated with a server.")
   private ProbeTuning livenessProbe = new ProbeTuning();
+
   /**
    * Defines the settings for the readiness probe. Any that are not specified will default to the
    * runtime readiness probe tuning settings.
@@ -71,6 +75,7 @@ class ServerPod extends KubernetesResource {
    */
   @Description("Settings for the readiness probe associated with a server.")
   private ProbeTuning readinessProbe = new ProbeTuning();
+
   /**
    * Defines the key-value pairs for the pod to fit on a node, the node must have each of the
    * indicated key-value pairs as labels.
@@ -80,6 +85,35 @@ class ServerPod extends KubernetesResource {
   @Description(
       "Selector which must match a node's labels for the pod to be scheduled on that node.")
   private Map<String, String> nodeSelector = new HashMap<>();
+
+  @SerializedName("activeDeadlineSeconds")
+  private Long activeDeadlineSeconds = null;
+  @SerializedName("affinity")
+  private V1Affinity affinity = null;
+  @SerializedName("dnsConfig")
+  private V1PodDNSConfig dnsConfig = null;
+  @SerializedName("hostAliases")
+  private List<V1HostAlias> hostAliases = null;
+  @SerializedName("priority")
+  private Integer priority = null;
+  @SerializedName("priorityClassName")
+  private String priorityClassName = null;
+  @SerializedName("readinessGates")
+  private List<V1PodReadinessGate> readinessGates = null;
+  @SerializedName("restartPolicy")
+  private String restartPolicy = null;
+  @SerializedName("runtimeClassName")
+  private String runtimeClassName = null;
+  @SerializedName("schedulerName")
+  private String schedulerName = null;
+  @SerializedName("securityContext")
+  private V1PodSecurityContext securityContext = null;
+  @SerializedName("shareProcessNamespace")
+  private Boolean shareProcessNamespace = null;
+  @SerializedName("tolerations")
+  private List<V1Toleration> tolerations = null;
+
+
   /**
    * Defines the requirements and limits for the pod server.
    *
@@ -88,6 +122,7 @@ class ServerPod extends KubernetesResource {
   @Description("Memory and CPU minimum requirements and limits for the server.")
   private V1ResourceRequirements resources =
       new V1ResourceRequirements().limits(new HashMap<>()).requests(new HashMap<>());
+
   /**
    * PodSecurityContext holds pod-level security attributes and common container settings. Some
    * fields are also present in container.securityContext. Field values of container.securityContext
@@ -97,6 +132,7 @@ class ServerPod extends KubernetesResource {
    */
   @Description("Pod-level security attributes.")
   private V1PodSecurityContext podSecurityContext = new V1PodSecurityContext();
+
   /**
    * InitContainers holds a list of initialization containers that should be run before starting the
    * main containers in this pod.
@@ -105,20 +141,23 @@ class ServerPod extends KubernetesResource {
    */
   @Description("Initialization containers to be included in the server pod.")
   private List<V1Container> initContainers = new ArrayList<>();
+
   /**
    * The additional containers.
    *
    * @since 2.1
    */
   @Description("Additional containers to be included in the server pod.")
   private List<V1Container> containers = new ArrayList<>();
+
   /**
    * Configures how the operator should shutdown the server instance.
    *
    * @since 2.2
    */
   @Description("Configures how the operator should shutdown the server instance.")
   private Shutdown shutdown = new Shutdown();
+
   /**
    * SecurityContext holds security configuration that will be applied to a container. Some fields
    * are present in both SecurityContext and PodSecurityContext. When both are set, the values in
@@ -129,13 +168,15 @@ class ServerPod extends KubernetesResource {
   @Description(
       "Container-level security attributes. Will override any matching pod-level attributes.")
   private V1SecurityContext containerSecurityContext = new V1SecurityContext();
+
   /**
    * The additional volumes.
    *
    * @since 2.0
    */
   @Description("Additional volumes to be created in the server pod.")
   private List<V1Volume> volumes = new ArrayList<>();
+
   /**
    * The additional volume mounts.
    *

model/src/main/java/oracle/kubernetes/weblogic/domain/model/SubsystemHealth.java

@@ -35,7 +35,7 @@ public class SubsystemHealth implements Comparable<SubsystemHealth> {
   @SerializedName("symptoms")
   @Expose
   @Valid
-  private List<String> symptoms = new ArrayList<String>();
+  private List<String> symptoms = new ArrayList<>();
 
   /**
    * Server health of this WebLogic Server. Required.