More affinity updates and bump version

rjeberhard · rjeberhard · commit c77121c43904 · 2019-08-03T10:00:53.000-04:00
diff --git a/docs/domains/Domain.json b/docs/domains/Domain.json
@@ -503,10 +503,6 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
-        "priority": {
-          "description": "The priority value. Various system components use this field to find the priority of the pod. When Priority Admission Controller is enabled, it prevents users from setting this field. The admission controller populates this field from PriorityClassName. The higher the value, the higher the priority.",
-          "type": "number"
-        },
         "restartPolicy": {
           "description": "Restart policy for all containers within the pod. One of Always, OnFailure, Never. Default to Always. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy",
           "type": "string"
diff --git a/docs/domains/Domain.md b/docs/domains/Domain.md
@@ -111,7 +111,6 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 | `nodeName` | string | NodeName is a request to schedule this pod onto a specific node. If it is non-empty, the scheduler simply schedules this pod onto that node, assuming that it fits resource requirements. |
 | `nodeSelector` | Map | Selector which must match a node's labels for the pod to be scheduled on that node. |
 | `podSecurityContext` | [Pod Security Context](k8s1.13.5.md#pod-security-context) | Pod-level security attributes. |
-| `priority` | number | The priority value. Various system components use this field to find the priority of the pod. When Priority Admission Controller is enabled, it prevents users from setting this field. The admission controller populates this field from PriorityClassName. The higher the value, the higher the priority. |
 | `priorityClassName` | string | If specified, indicates the pod's priority. "system-node-critical" and "system-cluster-critical" are two special keywords which indicate the highest priorities with the former being the highest priority. Any other name must be defined by creating a PriorityClass object with that name. If not specified, the pod priority will be default or zero if there is no default. |
 | `readinessGates` | array of [Pod Readiness Gate](k8s1.13.5.md#pod-readiness-gate) | If specified, all readiness gates will be evaluated for pod readiness. A pod is ready when all its containers are ready AND all conditions specified in the readiness gates have status equal to "True" More info: https://github.com/kubernetes/community/blob/master/keps/sig-network/0007-pod-ready%2B%2B.md |
 | `readinessProbe` | [Probe Tuning](#probe-tuning) | Settings for the readiness probe associated with a server. |
diff --git a/docs/domains/index.html b/docs/domains/index.html
@@ -1423,10 +1423,6 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
-        "priority": {
-          "description": "The priority value. Various system components use this field to find the priority of the pod. When Priority Admission Controller is enabled, it prevents users from setting this field. The admission controller populates this field from PriorityClassName. The higher the value, the higher the priority.",
-          "type": "number"
-        },
         "restartPolicy": {
           "description": "Restart policy for all containers within the pod. One of Always, OnFailure, Never. Default to Always. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy",
           "type": "string"
diff --git a/integration-tests/src/test/resources/OperatorIT.properties b/integration-tests/src/test/resources/OperatorIT.properties
@@ -11,4 +11,4 @@ weblogicImageTag = 12.2.1.3
 weblogicImageDevTag = 12.2.1.3-dev
 weblogicImageName = container-registry.oracle.com/middleware/weblogic
 OCR_SERVER=container-registry.oracle.com
-DOMAIN_API_VERSION = weblogic.oracle/v4
+DOMAIN_API_VERSION = weblogic.oracle/v5
diff --git a/kubernetes/samples/scripts/common/domain-template.yaml b/kubernetes/samples/scripts/common/domain-template.yaml
@@ -4,7 +4,7 @@
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v4"
+apiVersion: "weblogic.oracle/v5"
 kind: Domain
 metadata:
   name: %DOMAIN_UID%
diff --git a/kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml b/kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml
@@ -5,7 +5,7 @@
 # This is an example of how to define a Domain resource.  Please read through the comments which explain
 # what updates are needed.
 #
-apiVersion: "weblogic.oracle/v4"
+apiVersion: "weblogic.oracle/v5"
 kind: Domain
 metadata:
   # Update this with the `domainUID` of your domain:
diff --git a/model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java b/model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java
@@ -22,8 +22,8 @@ public interface KubernetesConstants {
   String DOMAIN_PLURAL = "domains";
   String DOMAIN_SINGULAR = "domain";
   String DOMAIN_SHORT = "dom";
-  String DOMAIN_VERSION = "v4";
-  String[] DOMAIN_ALTERNATE_VERSIONS = {"v2", "v3"};
+  String DOMAIN_VERSION = "v5";
+  String[] DOMAIN_ALTERNATE_VERSIONS = {"v2", "v3", "v4"};
 
   boolean DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = true;
 
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/BaseConfiguration.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/BaseConfiguration.java
@@ -169,10 +169,6 @@ public V1Affinity getAffinity() {
     return serverPod.getAffinity();
   }
 
-  public Integer getPriority() {
-    return serverPod.getPriority();
-  }
-
   public String getPriorityClassName() {
     return serverPod.getPriorityClassName();
   }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ClusterSpec.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ClusterSpec.java
@@ -9,7 +9,10 @@
 import java.util.Map;
 import javax.annotation.Nonnull;
 
+import io.kubernetes.client.models.V1Affinity;
 import io.kubernetes.client.models.V1Container;
+import io.kubernetes.client.models.V1PodReadinessGate;
+import io.kubernetes.client.models.V1Toleration;
 
 public abstract class ClusterSpec {
   /**
@@ -79,4 +82,21 @@ public List<V1Container> getContainers() {
    */
   @Nonnull
   public abstract Shutdown getShutdown();
+
+  public abstract V1Affinity getAffinity();
+
+  public abstract String getPriorityClassName();
+
+  public abstract List<V1PodReadinessGate> getReadinessGates();
+
+  public abstract String getRestartPolicy();
+
+  public abstract String getRuntimeClassName();
+
+  public abstract String getNodeName();
+
+  public abstract String getSchedulerName();
+
+  public abstract List<V1Toleration> getTolerations();
+
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ClusterSpecCommonImpl.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ClusterSpecCommonImpl.java
@@ -7,7 +7,10 @@
 import java.util.List;
 import java.util.Map;
 
+import io.kubernetes.client.models.V1Affinity;
 import io.kubernetes.client.models.V1Container;
+import io.kubernetes.client.models.V1PodReadinessGate;
+import io.kubernetes.client.models.V1Toleration;
 
 public class ClusterSpecCommonImpl extends ClusterSpec {
   private final Cluster cluster;
@@ -60,4 +63,45 @@ public List<V1Container> getContainers() {
   public Shutdown getShutdown() {
     return cluster.getShutdown();
   }
+
+  @Override
+  public V1Affinity getAffinity() {
+    return cluster.getAffinity();
+  }
+
+  @Override
+  public String getPriorityClassName() {
+    return cluster.getPriorityClassName();
+  }
+
+  @Override
+  public List<V1PodReadinessGate> getReadinessGates() {
+    return cluster.getReadinessGates();
+  }
+
+  @Override
+  public String getRestartPolicy() {
+    return cluster.getRestartPolicy();
+  }
+
+  @Override
+  public String getRuntimeClassName() {
+    return cluster.getRuntimeClassName();
+  }
+
+  @Override
+  public String getNodeName() {
+    return cluster.getNodeName();
+  }
+
+  @Override
+  public String getSchedulerName() {
+    return cluster.getSchedulerName();
+  }
+
+  @Override
+  public List<V1Toleration> getTolerations() {
+    return cluster.getTolerations();
+  }
+
 }
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerPod.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerPod.java
@@ -89,12 +89,6 @@ class ServerPod extends KubernetesResource {
   @Description("If specified, the pod's scheduling constraints")
   private V1Affinity affinity = null;
 
-  @Description("The priority value. Various system components use this field to find the priority "
-      + "of the pod. When Priority Admission Controller is enabled, it prevents users from setting this field. "
-      + "The admission controller populates this field from PriorityClassName. The higher the value, the "
-      + "higher the priority.")
-  private Integer priority = null;
-
   @Description("If specified, indicates the pod's priority. \"system-node-critical\" and \"system-cluster-critical\" "
       + "are two special keywords which indicate the highest priorities with the former being the highest priority. "
       + "Any other name must be defined by creating a PriorityClass object with that name. If not specified, the pod "
@@ -423,9 +417,6 @@ void fillInFrom(ServerPod serverPod1) {
     } else if (serverPod1.affinity != null) {
       copyValues(affinity, serverPod1.affinity);
     }
-    if (priority == null) {
-      priority = serverPod1.priority;
-    }
     if (priorityClassName == null) {
       priorityClassName = serverPod1.priorityClassName;
     }
@@ -635,14 +626,6 @@ void setAffinity(V1Affinity affinity) {
     this.affinity = affinity;
   }
 
-  Integer getPriority() {
-    return priority;
-  }
-
-  void setPriority(Integer priority) {
-    this.priority = priority;
-  }
-
   String getPriorityClassName() {
     return priorityClassName;
   }
@@ -724,7 +707,6 @@ public String toString() {
         .append("containers", containers)
         .append("shutdown", shutdown)
         .append("affinity", affinity)
-        .append("priority", priority)
         .append("priorityClassName", priorityClassName)
         .append("readinessGates", readinessGates)
         .append("restartPolicy", restartPolicy)
@@ -768,7 +750,6 @@ public boolean equals(Object o) {
         .append(containers, that.containers)
         .append(shutdown, that.shutdown)
         .append(affinity, that.affinity)
-        .append(priority, that.priority)
         .append(priorityClassName, that.priorityClassName)
         .append(readinessGates, that.readinessGates)
         .append(restartPolicy, that.restartPolicy)
@@ -796,7 +777,6 @@ public int hashCode() {
         .append(containers)
         .append(shutdown)
         .append(affinity)
-        .append(priority)
         .append(priorityClassName)
         .append(readinessGates)
         .append(restartPolicy)
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerSpec.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerSpec.java
@@ -141,8 +141,6 @@ public interface ServerSpec {
 
   V1Affinity getAffinity();
 
-  Integer getPriority();
-
   String getPriorityClassName();
 
   List<V1PodReadinessGate> getReadinessGates();
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerSpecBase.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerSpecBase.java
@@ -102,11 +102,6 @@ public V1Affinity getAffinity() {
     return null;
   }
 
-  @Override
-  public Integer getPriority() {
-    return null;
-  }
-
   @Override
   public String getPriorityClassName() {
     return null;
diff --git a/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerSpecCommonImpl.java b/model/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerSpecCommonImpl.java
@@ -167,11 +167,6 @@ public V1Affinity getAffinity() {
     return server.getAffinity();
   }
 
-  @Override
-  public Integer getPriority() {
-    return server.getPriority();
-  }
-
   @Override
   public String getPriorityClassName() {
     return server.getPriorityClassName();
diff --git a/model/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainV2Test.java b/model/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainV2Test.java
@@ -50,6 +50,7 @@ public class DomainV2Test extends DomainTestBase {
   private static final String DOMAIN_V2_SAMPLE_YAML_2 = "model/domain-sample-2.yaml";
   private static final String DOMAIN_V2_SAMPLE_YAML_3 = "model/domain-sample-3.yaml";
   private static final String DOMAIN_V2_SAMPLE_YAML_4 = "model/domain-sample-4.yaml";
+  private static final String DOMAIN_V2_SAMPLE_YAML_5 = "model/domain-sample-5.yaml";
   private static final int INITIAL_DELAY = 17;
   private static final int TIMEOUT = 23;
   private static final int PERIOD = 5;
@@ -1133,6 +1134,54 @@ public void whenDomain2ReadFromYaml_ShutdownIsReadFromServerSpec() throws IOExce
     assertThat(shutdown.getIgnoreSessions(), is(false));
   }
 
+  @Test
+  public void whenDomain2ReadFromYaml_RestartPolicyIsReadFromSpec() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_5);
+
+    String restartPolicy = domain.getSpec().getRestartPolicy();
+    assertThat(restartPolicy, is("OnFailure"));
+  }
+
+  @Test
+  public void whenDomain2ReadFromYaml_RestartPolicyIsReadFromClusterSpec() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_5);
+
+    String restartPolicy = domain.getCluster("cluster2").getRestartPolicy();
+    assertThat(restartPolicy, is("OnFailure"));
+  }
+
+  @Test
+  public void whenDomain2ReadFromYaml_RuntimeClassNameIsReadFromSpec() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_5);
+
+    String runtimeClassName = domain.getSpec().getRuntimeClassName();
+    assertThat(runtimeClassName, is("weblogic-class"));
+  }
+
+  @Test
+  public void whenDomain2ReadFromYaml_RuntimeClassNameIsReadFromClusterSpec() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_5);
+
+    String runtimeClassName = domain.getCluster("cluster2").getRuntimeClassName();
+    assertThat(runtimeClassName, is("weblogic-class"));
+  }
+
+  @Test
+  public void whenDomain2ReadFromYaml_SchedulerNameIsReadFromSpec() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_5);
+
+    String schedulerName = domain.getSpec().getSchedulerName();
+    assertThat(schedulerName, is("my-scheduler"));
+  }
+
+  @Test
+  public void whenDomain2ReadFromYaml_SchedulerClassNameIsReadFromClusterSpec() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_5);
+
+    String schedulerName = domain.getCluster("cluster2").getSchedulerName();
+    assertThat(schedulerName, is("my-scheduler"));
+  }
+
   @Test
   public void whenDomain2ReadFromYaml_serviceAnnotationsFound() throws IOException {
     Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_2);
diff --git a/model/src/test/resources/oracle/kubernetes/weblogic/domain/model/domain-sample-5.yaml b/model/src/test/resources/oracle/kubernetes/weblogic/domain/model/domain-sample-5.yaml
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# This is an example of how to define a Domain resource.`
`6`	`6`	`#`
`7`		`-apiVersion: "weblogic.oracle/v4"`
	`7`	`+apiVersion: "weblogic.oracle/v5"`
`8`	`8`	`kind: Domain`
`9`	`9`	`metadata:`
`10`	`10`	`name: %DOMAIN_UID%`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# This is an example of how to define a Domain resource. Please read through the comments which explain`
`6`	`6`	`# what updates are needed.`
`7`	`7`	`#`
`8`		`-apiVersion: "weblogic.oracle/v4"`
	`8`	`+apiVersion: "weblogic.oracle/v5"`
`9`	`9`	`kind: Domain`
`10`	`10`	`metadata:`
`11`	`11`	# Update this with the `domainUID` of your domain:
Original file line number	Diff line number	Diff line change
`@@ -169,10 +169,6 @@ public V1Affinity getAffinity() {`
`169`	`169`	`return serverPod.getAffinity();`
`170`	`170`	`}`
`171`	`171`
`172`		`- public Integer getPriority() {`
`173`		`- return serverPod.getPriority();`
`174`		`- }`
`175`		`-`
`176`	`172`	`public String getPriorityClassName() {`
`177`	`173`	`return serverPod.getPriorityClassName();`
`178`	`174`	`}`