Skip to content

Commit 1098130

Browse files
committed
Add scheduling related server pod elements
1 parent 6d9a7cd commit 1098130

File tree

16 files changed

+574
-51
lines changed

16 files changed

+574
-51
lines changed

docs/domains/Domain.json

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,18 +298,18 @@
298298
"description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
299299
"type": "boolean"
300300
},
301-
"clusters": {
302-
"description": "Configuration for the clusters.",
301+
"managedServers": {
302+
"description": "Configuration for individual Managed Servers.",
303303
"type": "array",
304304
"items": {
305-
"$ref": "#/definitions/Cluster"
305+
"$ref": "#/definitions/ManagedServer"
306306
}
307307
},
308-
"managedServers": {
309-
"description": "Configuration for individual Managed Servers.",
308+
"clusters": {
309+
"description": "Configuration for the clusters.",
310310
"type": "array",
311311
"items": {
312-
"$ref": "#/definitions/ManagedServer"
312+
"$ref": "#/definitions/Cluster"
313313
}
314314
}
315315
}
@@ -458,14 +458,29 @@
458458
"description": "ServerPod describes the configuration for a Kubernetes pod for a server.",
459459
"type": "object",
460460
"properties": {
461+
"nodeName": {
462+
"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.",
463+
"type": "string"
464+
},
461465
"livenessProbe": {
462466
"description": "Settings for the liveness probe associated with a server.",
463467
"$ref": "#/definitions/ProbeTuning"
464468
},
469+
"readinessGates": {
470+
"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",
471+
"type": "array",
472+
"items": {
473+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodReadinessGate"
474+
}
475+
},
465476
"podSecurityContext": {
466477
"description": "Pod-level security attributes.",
467478
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext"
468479
},
480+
"priorityClassName": {
481+
"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.",
482+
"type": "string"
483+
},
469484
"volumes": {
470485
"description": "Additional volumes to be created in the server pod.",
471486
"type": "array",
@@ -488,6 +503,14 @@
488503
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
489504
}
490505
},
506+
"priority": {
507+
"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.",
508+
"type": "number"
509+
},
510+
"restartPolicy": {
511+
"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",
512+
"type": "string"
513+
},
491514
"nodeSelector": {
492515
"description": "Selector which must match a node\u0027s labels for the pod to be scheduled on that node.",
493516
"$ref": "#/definitions/Map"
@@ -503,6 +526,17 @@
503526
"description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
504527
"$ref": "#/definitions/Map"
505528
},
529+
"runtimeClassName": {
530+
"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.",
531+
"type": "string"
532+
},
533+
"tolerations": {
534+
"description": "If specified, the pod\u0027s tolerations.",
535+
"type": "array",
536+
"items": {
537+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
538+
}
539+
},
506540
"readinessProbe": {
507541
"description": "Settings for the readiness probe associated with a server.",
508542
"$ref": "#/definitions/ProbeTuning"
@@ -518,6 +552,10 @@
518552
"description": "Container-level security attributes. Will override any matching pod-level attributes.",
519553
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
520554
},
555+
"schedulerName": {
556+
"description": "If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.",
557+
"type": "string"
558+
},
521559
"initContainers": {
522560
"description": "Initialization containers to be included in the server pod.",
523561
"type": "array",
@@ -528,6 +566,10 @@
528566
"shutdown": {
529567
"description": "Configures how the operator should shutdown the server instance.",
530568
"$ref": "#/definitions/Shutdown"
569+
},
570+
"affinity": {
571+
"description": "If specified, the pod\u0027s scheduling constraints",
572+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
531573
}
532574
}
533575
},

docs/domains/Domain.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,27 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
100100

101101
| Name | Type | Description |
102102
| --- | --- | --- |
103+
| `affinity` | [Affinity](k8s1.13.5.md#affinity) | If specified, the pod's scheduling constraints |
103104
| `annotations` | Map | The annotations to be attached to generated resources. |
104105
| `containers` | array of [Container](k8s1.13.5.md#container) | Additional containers to be included in the server pod. |
105106
| `containerSecurityContext` | [Security Context](k8s1.13.5.md#security-context) | Container-level security attributes. Will override any matching pod-level attributes. |
106107
| `env` | array of [Env Var](k8s1.13.5.md#env-var) | A list of environment variables to add to a server. |
107108
| `initContainers` | array of [Container](k8s1.13.5.md#container) | Initialization containers to be included in the server pod. |
108109
| `labels` | Map | The labels to be attached to generated resources. The label names must not start with 'weblogic.'. |
109110
| `livenessProbe` | [Probe Tuning](#probe-tuning) | Settings for the liveness probe associated with a server. |
111+
| `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. |
110112
| `nodeSelector` | Map | Selector which must match a node's labels for the pod to be scheduled on that node. |
111113
| `podSecurityContext` | [Pod Security Context](k8s1.13.5.md#pod-security-context) | Pod-level security attributes. |
114+
| `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. |
115+
| `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. |
116+
| `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 |
112117
| `readinessProbe` | [Probe Tuning](#probe-tuning) | Settings for the readiness probe associated with a server. |
113118
| `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Memory and CPU minimum requirements and limits for the server. |
119+
| `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 |
120+
| `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. |
121+
| `schedulerName` | string | If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler. |
114122
| `shutdown` | [Shutdown](#shutdown) | Configures how the operator should shutdown the server instance. |
123+
| `tolerations` | array of [Toleration](k8s1.13.5.md#toleration) | If specified, the pod's tolerations. |
115124
| `volumeMounts` | array of [Volume Mount](k8s1.13.5.md#volume-mount) | Additional volume mounts for the server pod. |
116125
| `volumes` | array of [Volume](k8s1.13.5.md#volume) | Additional volumes to be created in the server pod. |
117126

docs/domains/index.html

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,18 +1218,18 @@
12181218
"description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
12191219
"type": "boolean"
12201220
},
1221-
"clusters": {
1222-
"description": "Configuration for the clusters.",
1221+
"managedServers": {
1222+
"description": "Configuration for individual Managed Servers.",
12231223
"type": "array",
12241224
"items": {
1225-
"$ref": "#/definitions/Cluster"
1225+
"$ref": "#/definitions/ManagedServer"
12261226
}
12271227
},
1228-
"managedServers": {
1229-
"description": "Configuration for individual Managed Servers.",
1228+
"clusters": {
1229+
"description": "Configuration for the clusters.",
12301230
"type": "array",
12311231
"items": {
1232-
"$ref": "#/definitions/ManagedServer"
1232+
"$ref": "#/definitions/Cluster"
12331233
}
12341234
}
12351235
}
@@ -1378,14 +1378,29 @@
13781378
"description": "ServerPod describes the configuration for a Kubernetes pod for a server.",
13791379
"type": "object",
13801380
"properties": {
1381+
"nodeName": {
1382+
"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.",
1383+
"type": "string"
1384+
},
13811385
"livenessProbe": {
13821386
"description": "Settings for the liveness probe associated with a server.",
13831387
"$ref": "#/definitions/ProbeTuning"
13841388
},
1389+
"readinessGates": {
1390+
"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",
1391+
"type": "array",
1392+
"items": {
1393+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodReadinessGate"
1394+
}
1395+
},
13851396
"podSecurityContext": {
13861397
"description": "Pod-level security attributes.",
13871398
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext"
13881399
},
1400+
"priorityClassName": {
1401+
"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.",
1402+
"type": "string"
1403+
},
13891404
"volumes": {
13901405
"description": "Additional volumes to be created in the server pod.",
13911406
"type": "array",
@@ -1408,6 +1423,14 @@
14081423
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
14091424
}
14101425
},
1426+
"priority": {
1427+
"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.",
1428+
"type": "number"
1429+
},
1430+
"restartPolicy": {
1431+
"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",
1432+
"type": "string"
1433+
},
14111434
"nodeSelector": {
14121435
"description": "Selector which must match a node\u0027s labels for the pod to be scheduled on that node.",
14131436
"$ref": "#/definitions/Map"
@@ -1423,6 +1446,17 @@
14231446
"description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
14241447
"$ref": "#/definitions/Map"
14251448
},
1449+
"runtimeClassName": {
1450+
"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.",
1451+
"type": "string"
1452+
},
1453+
"tolerations": {
1454+
"description": "If specified, the pod\u0027s tolerations.",
1455+
"type": "array",
1456+
"items": {
1457+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
1458+
}
1459+
},
14261460
"readinessProbe": {
14271461
"description": "Settings for the readiness probe associated with a server.",
14281462
"$ref": "#/definitions/ProbeTuning"
@@ -1438,6 +1472,10 @@
14381472
"description": "Container-level security attributes. Will override any matching pod-level attributes.",
14391473
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
14401474
},
1475+
"schedulerName": {
1476+
"description": "If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.",
1477+
"type": "string"
1478+
},
14411479
"initContainers": {
14421480
"description": "Initialization containers to be included in the server pod.",
14431481
"type": "array",
@@ -1448,6 +1486,10 @@
14481486
"shutdown": {
14491487
"description": "Configures how the operator should shutdown the server instance.",
14501488
"$ref": "#/definitions/Shutdown"
1489+
},
1490+
"affinity": {
1491+
"description": "If specified, the pod\u0027s scheduling constraints",
1492+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
14511493
}
14521494
}
14531495
},

0 commit comments

Comments
 (0)