Merge pull request #1171 from oracle/affinity

Affinity and scheduling related serverPod schema elements

Author: rjeberhard

docs/charts/index.yaml

@@ -1,39 +1,39 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: 2019-06-21T17:07:47.254382-04:00
+  - created: "2019-07-25T14:26:55.411022-04:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: 0af0ca39bf33b38d82a22a21c32e1cb3da3f78d841ba2c4cfaa4c0e743d3b9b3
+    digest: 755825da5adcc30f57bca540509813aeb8d73ddd69d85e4f30b29d73696e2ee8
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
-  - created: 2019-06-21T17:07:47.252194-04:00
+  - created: "2019-07-25T14:26:55.408716-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
     version: 2.2.1
-  - created: 2019-06-21T17:07:47.250143-04:00
+  - created: "2019-07-25T14:26:55.407036-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
-  - created: 2019-06-21T17:07:47.246971-04:00
+  - created: "2019-07-25T14:26:55.405384-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
-  - created: 2019-06-21T17:07:47.245138-04:00
+  - created: "2019-07-25T14:26:55.403824-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: 2019-06-21T17:07:47.24317-04:00
+generated: "2019-07-25T14:26:55.401818-04:00"

docs/charts/weblogic-operator-2.3.0.tgz

@@ -298,18 +298,18 @@
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"
         },
-        "clusters": {
-          "description": "Configuration for the clusters.",
+        "managedServers": {
+          "description": "Configuration for individual Managed Servers.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Cluster"
+            "$ref": "#/definitions/ManagedServer"
           }
         },
-        "managedServers": {
-          "description": "Configuration for individual Managed Servers.",
+        "clusters": {
+          "description": "Configuration for the clusters.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ManagedServer"
+            "$ref": "#/definitions/Cluster"
           }
         }
       }
@@ -458,14 +458,29 @@
       "description": "ServerPod describes the configuration for a Kubernetes pod for a server.",
       "type": "object",
       "properties": {
+        "nodeName": {
+          "description": "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.",
+          "type": "string"
+        },
         "livenessProbe": {
           "description": "Settings for the liveness probe associated with a server.",
           "$ref": "#/definitions/ProbeTuning"
         },
+        "readinessGates": {
+          "description": "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",
+          "type": "array",
+          "items": {
+            "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodReadinessGate"
+          }
+        },
         "podSecurityContext": {
           "description": "Pod-level security attributes.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext"
         },
+        "priorityClassName": {
+          "description": "If specified, indicates the pod\u0027s 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.",
+          "type": "string"
+        },
         "volumes": {
           "description": "Additional volumes to be created in the server pod.",
           "type": "array",
@@ -488,6 +503,10 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
+        "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"
+        },
         "nodeSelector": {
           "description": "Selector which must match a node\u0027s labels for the pod to be scheduled on that node.",
           "$ref": "#/definitions/Map"
@@ -503,6 +522,17 @@
           "description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
           "$ref": "#/definitions/Map"
         },
+        "runtimeClassName": {
+          "description": "RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used to run this pod.  If no RuntimeClass resource matches the named class, the pod will not be run. If unset or empty, the \"legacy\" RuntimeClass will be used, which is an implicit class with an empty definition that uses the default runtime handler. More info: https://github.com/kubernetes/community/blob/master/keps/sig-node/0014-runtime-class.md This is an alpha feature and may change in the future.",
+          "type": "string"
+        },
+        "tolerations": {
+          "description": "If specified, the pod\u0027s tolerations.",
+          "type": "array",
+          "items": {
+            "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
+          }
+        },
         "readinessProbe": {
           "description": "Settings for the readiness probe associated with a server.",
           "$ref": "#/definitions/ProbeTuning"
@@ -518,6 +548,10 @@
           "description": "Container-level security attributes. Will override any matching pod-level attributes.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
         },
+        "schedulerName": {
+          "description": "If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.",
+          "type": "string"
+        },
         "initContainers": {
           "description": "Initialization containers to be included in the server pod.",
           "type": "array",
@@ -528,6 +562,10 @@
         "shutdown": {
           "description": "Configures how the operator should shutdown the server instance.",
           "$ref": "#/definitions/Shutdown"
+        },
+        "affinity": {
+          "description": "If specified, the pod\u0027s scheduling constraints",
+          "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
         }
       }
     },

docs/domains/Domain.json

@@ -100,18 +100,26 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 
 | Name | Type | Description |
 | --- | --- | --- |
+| `affinity` | [Affinity](k8s1.13.5.md#affinity) | If specified, the pod's scheduling constraints |
 | `annotations` | Map | The annotations to be attached to generated resources. |
 | `containers` | array of [Container](k8s1.13.5.md#container) | Additional containers to be included in the server pod. |
 | `containerSecurityContext` | [Security Context](k8s1.13.5.md#security-context) | Container-level security attributes. Will override any matching pod-level attributes. |
 | `env` | array of [Env Var](k8s1.13.5.md#env-var) | A list of environment variables to add to a server. |
 | `initContainers` | array of [Container](k8s1.13.5.md#container) | Initialization containers to be included in the server pod. |
 | `labels` | Map | The labels to be attached to generated resources. The label names must not start with 'weblogic.'. |
 | `livenessProbe` | [Probe Tuning](#probe-tuning) | Settings for the liveness probe associated with 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. |
+| `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. |
 | `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Memory and CPU minimum requirements and limits for the server. |
+| `restartPolicy` | string | 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 |
+| `runtimeClassName` | string | RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used to run this pod.  If no RuntimeClass resource matches the named class, the pod will not be run. If unset or empty, the "legacy" RuntimeClass will be used, which is an implicit class with an empty definition that uses the default runtime handler. More info: https://github.com/kubernetes/community/blob/master/keps/sig-node/0014-runtime-class.md This is an alpha feature and may change in the future. |
+| `schedulerName` | string | If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler. |
 | `shutdown` | [Shutdown](#shutdown) | Configures how the operator should shutdown the server instance. |
+| `tolerations` | array of [Toleration](k8s1.13.5.md#toleration) | If specified, the pod's tolerations. |
 | `volumeMounts` | array of [Volume Mount](k8s1.13.5.md#volume-mount) | Additional volume mounts for the server pod. |
 | `volumes` | array of [Volume](k8s1.13.5.md#volume) | Additional volumes to be created in the server pod. |
 

docs/domains/Domain.md

@@ -1218,18 +1218,18 @@
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"
         },
-        "clusters": {
-          "description": "Configuration for the clusters.",
+        "managedServers": {
+          "description": "Configuration for individual Managed Servers.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Cluster"
+            "$ref": "#/definitions/ManagedServer"
           }
         },
-        "managedServers": {
-          "description": "Configuration for individual Managed Servers.",
+        "clusters": {
+          "description": "Configuration for the clusters.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ManagedServer"
+            "$ref": "#/definitions/Cluster"
           }
         }
       }
@@ -1378,14 +1378,29 @@
       "description": "ServerPod describes the configuration for a Kubernetes pod for a server.",
       "type": "object",
       "properties": {
+        "nodeName": {
+          "description": "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.",
+          "type": "string"
+        },
         "livenessProbe": {
           "description": "Settings for the liveness probe associated with a server.",
           "$ref": "#/definitions/ProbeTuning"
         },
+        "readinessGates": {
+          "description": "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",
+          "type": "array",
+          "items": {
+            "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodReadinessGate"
+          }
+        },
         "podSecurityContext": {
           "description": "Pod-level security attributes.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext"
         },
+        "priorityClassName": {
+          "description": "If specified, indicates the pod\u0027s 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.",
+          "type": "string"
+        },
         "volumes": {
           "description": "Additional volumes to be created in the server pod.",
           "type": "array",
@@ -1408,6 +1423,10 @@
             "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
+        "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"
+        },
         "nodeSelector": {
           "description": "Selector which must match a node\u0027s labels for the pod to be scheduled on that node.",
           "$ref": "#/definitions/Map"
@@ -1423,6 +1442,17 @@
           "description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
           "$ref": "#/definitions/Map"
         },
+        "runtimeClassName": {
+          "description": "RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used to run this pod.  If no RuntimeClass resource matches the named class, the pod will not be run. If unset or empty, the \"legacy\" RuntimeClass will be used, which is an implicit class with an empty definition that uses the default runtime handler. More info: https://github.com/kubernetes/community/blob/master/keps/sig-node/0014-runtime-class.md This is an alpha feature and may change in the future.",
+          "type": "string"
+        },
+        "tolerations": {
+          "description": "If specified, the pod\u0027s tolerations.",
+          "type": "array",
+          "items": {
+            "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
+          }
+        },
         "readinessProbe": {
           "description": "Settings for the readiness probe associated with a server.",
           "$ref": "#/definitions/ProbeTuning"
@@ -1438,6 +1468,10 @@
           "description": "Container-level security attributes. Will override any matching pod-level attributes.",
           "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
         },
+        "schedulerName": {
+          "description": "If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.",
+          "type": "string"
+        },
         "initContainers": {
           "description": "Initialization containers to be included in the server pod.",
           "type": "array",
@@ -1448,6 +1482,10 @@
         "shutdown": {
           "description": "Configures how the operator should shutdown the server instance.",
           "$ref": "#/definitions/Shutdown"
+        },
+        "affinity": {
+          "description": "If specified, the pod\u0027s scheduling constraints",
+          "$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
         }
       }
     },