Skip to content

Commit 68c9bc6

Browse files
rjeberhardrjeberhard
committed
Update solution to use full standard probe schema
1 parent c0658b2 commit 68c9bc6

File tree

17 files changed

+667
-655
lines changed

17 files changed

+667
-655
lines changed

‎documentation/domains/Cluster.json

Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -165,68 +165,6 @@
165165
"Map": {
166166
"type": "object"
167167
},
168-
"ProbeTuning": {
169-
"type": "object",
170-
"properties": {
171-
"failureThreshold": {
172-
"default": 1,
173-
"description": "Number of times the check is performed before giving up. Giving up in case of liveness probe means restarting the container. In case of readiness probe, the Pod will be marked Unready. Defaults to 1.",
174-
"type": "integer",
175-
"minimum": 1
176-
},
177-
"periodSeconds": {
178-
"description": "The number of seconds between checks.",
179-
"type": "integer"
180-
},
181-
"timeoutSeconds": {
182-
"description": "The number of seconds with no response that indicates a failure.",
183-
"type": "integer"
184-
},
185-
"successThreshold": {
186-
"default": 1,
187-
"description": "Minimum number of times the check needs to pass for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness Probe.",
188-
"type": "integer",
189-
"minimum": 1
190-
},
191-
"initialDelaySeconds": {
192-
"description": "The number of seconds before the first check is performed.",
193-
"type": "integer"
194-
}
195-
}
196-
},
197-
"ReadinessProbe": {
198-
"type": "object",
199-
"properties": {
200-
"failureThreshold": {
201-
"default": 1,
202-
"description": "Number of times the check is performed before giving up. Giving up in case of liveness probe means restarting the container. In case of readiness probe, the Pod will be marked Unready. Defaults to 1.",
203-
"type": "integer",
204-
"minimum": 1
205-
},
206-
"httpGetActionPath": {
207-
"description": "Path to access for the readiness probe. Defaults to /weblogic/ready",
208-
"type": "string"
209-
},
210-
"periodSeconds": {
211-
"description": "The number of seconds between checks.",
212-
"type": "integer"
213-
},
214-
"timeoutSeconds": {
215-
"description": "The number of seconds with no response that indicates a failure.",
216-
"type": "integer"
217-
},
218-
"successThreshold": {
219-
"default": 1,
220-
"description": "Minimum number of times the check needs to pass for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness Probe.",
221-
"type": "integer",
222-
"minimum": 1
223-
},
224-
"initialDelaySeconds": {
225-
"description": "The number of seconds before the first check is performed.",
226-
"type": "integer"
227-
}
228-
}
229-
},
230168
"ServerPod": {
231169
"type": "object",
232170
"properties": {
@@ -293,8 +231,8 @@
293231
}
294232
},
295233
"readinessProbe": {
296-
"description": "Settings for the readiness probe associated with a WebLogic Server instance.",
297-
"$ref": "#/definitions/ReadinessProbe"
234+
"description": "Settings for the readiness probe associated with a WebLogic Server instance. If not specified, the operator will create an HTTP probe accessing the /weblogic/ready path. If an HTTP probe is specified then the operator will fill in `path`, `port`, and `scheme`, if they are missing. The operator will also fill in any missing tuning-related fields if they are unspecified. Tuning-related fields will be inherited from the domain and cluster scopes unless a more specific scope defines a different action, such as a different HTTP path to access.",
235+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Probe"
298236
},
299237
"containerSecurityContext": {
300238
"description": "Container-level security attributes. Will override any matching Pod-level attributes. See `kubectl explain pods.spec.containers.securityContext`. Beginning with operator version 4.0.5, if no value is specified for this field, the operator will use default content for container-level `securityContext`. More info: https://oracle.github.io/weblogic-kubernetes-operator/security/domain-security/pod-and-container/.",
@@ -316,8 +254,8 @@
316254
"type": "integer"
317255
},
318256
"livenessProbe": {
319-
"description": "Settings for the liveness probe associated with a WebLogic Server instance.",
320-
"$ref": "#/definitions/ProbeTuning"
257+
"description": "Settings for the liveness probe associated with a WebLogic Server instance. If not specified, the operator will create a probe that executes a script provided by the operator. The operator will also fill in any missing tuning-related fields, if they are unspecified. Tuning-related fields will be inherited from the domain and cluster scopes unless a more specific scope defines a different action, such as a different script to execute.",
258+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Probe"
321259
},
322260
"topologySpreadConstraints": {
323261
"description": "TopologySpreadConstraints describes how a group of pods ought to spread across topology domains. Scheduler will schedule pods in a way which abides by the constraints. All topologySpreadConstraints are ANDed.",

‎documentation/domains/Cluster.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ The specification of the operation of the WebLogic cluster. Required.
6262
| `hostAliases` | Array of [Host Alias](k8s1.13.5.md#host-alias) | HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified. This is only valid for non-hostNetwork pods. |
6363
| `initContainers` | Array of [Container](k8s1.13.5.md#container) | Initialization containers to be included in the server Pod. See `kubectl explain pods.spec.initContainers`. |
6464
| `labels` | Map | The labels to be added to generated resources. The label names must not start with "weblogic.". |
65-
| `livenessProbe` | [Probe Tuning](#probe-tuning) | Settings for the liveness probe associated with a WebLogic Server instance. |
65+
| `livenessProbe` | [Probe](k8s1.13.5.md#probe) | Settings for the liveness probe associated with a WebLogic Server instance. If not specified, the operator will create a probe that executes a script provided by the operator. The operator will also fill in any missing tuning-related fields, if they are unspecified. Tuning-related fields will be inherited from the domain and cluster scopes unless a more specific scope defines a different action, such as a different script to execute. |
6666
| `maxPendingWaitTimeSeconds` | integer | The maximum time in seconds that the operator waits for a WebLogic Server pod to reach the running state before it considers the pod failed. Defaults to 5 minutes. |
6767
| `maxReadyWaitTimeSeconds` | integer | The maximum time in seconds that the operator waits for a WebLogic Server pod to reach the ready state before it considers the pod failed. Defaults to 1800 seconds. |
6868
| `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 the resource requirements. See `kubectl explain pods.spec.nodeName`. |
6969
| `nodeSelector` | Map | Selector which must match a Node's labels for the Pod to be scheduled on that Node. See `kubectl explain pods.spec.nodeSelector`. |
7070
| `podSecurityContext` | [Pod Security Context](k8s1.13.5.md#pod-security-context) | Pod-level security attributes. See `kubectl explain pods.spec.securityContext`. Beginning with operator version 4.0.5, if no value is specified for this field, the operator will use default content for the pod-level `securityContext`. More info: https://oracle.github.io/weblogic-kubernetes-operator/security/domain-security/pod-and-container/. |
7171
| `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 the default or zero, if there is no default. See `kubectl explain pods.spec.priorityClassName`. |
7272
| `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 a status equal to "True". More info: https://github.com/kubernetes/community/blob/master/keps/sig-network/0007-pod-ready%2B%2B.md. |
73-
| `readinessProbe` | [Readiness Probe](#readiness-probe) | Settings for the readiness probe associated with a WebLogic Server instance. |
73+
| `readinessProbe` | [Probe](k8s1.13.5.md#probe) | Settings for the readiness probe associated with a WebLogic Server instance. If not specified, the operator will create an HTTP probe accessing the /weblogic/ready path. If an HTTP probe is specified then the operator will fill in `path`, `port`, and `scheme`, if they are missing. The operator will also fill in any missing tuning-related fields if they are unspecified. Tuning-related fields will be inherited from the domain and cluster scopes unless a more specific scope defines a different action, such as a different HTTP path to access. |
7474
| `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Memory and CPU minimum requirements and limits for the WebLogic Server instance. See `kubectl explain pods.spec.containers.resources`. |
7575
| `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. See `kubectl explain pods.spec.restartPolicy`. |
7676
| `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. See `kubectl explain pods.spec.runtimeClassName`. |
@@ -99,27 +99,6 @@ The specification of the operation of the WebLogic cluster. Required.
9999
| `status` | string | The status of the condition. Can be True, False. |
100100
| `type` | string | The type of the condition. Valid types are Completed, Available, Failed, and Rolling. |
101101

102-
### Probe Tuning
103-
104-
| Name | Type | Description |
105-
| --- | --- | --- |
106-
| `failureThreshold` | integer | Number of times the check is performed before giving up. Giving up in case of liveness probe means restarting the container. In case of readiness probe, the Pod will be marked Unready. Defaults to 1. |
107-
| `initialDelaySeconds` | integer | The number of seconds before the first check is performed. |
108-
| `periodSeconds` | integer | The number of seconds between checks. |
109-
| `successThreshold` | integer | Minimum number of times the check needs to pass for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness Probe. |
110-
| `timeoutSeconds` | integer | The number of seconds with no response that indicates a failure. |
111-
112-
### Readiness Probe
113-
114-
| Name | Type | Description |
115-
| --- | --- | --- |
116-
| `failureThreshold` | integer | Number of times the check is performed before giving up. Giving up in case of liveness probe means restarting the container. In case of readiness probe, the Pod will be marked Unready. Defaults to 1. |
117-
| `httpGetActionPath` | string | Path to access for the readiness probe. Defaults to /weblogic/ready |
118-
| `initialDelaySeconds` | integer | The number of seconds before the first check is performed. |
119-
| `periodSeconds` | integer | The number of seconds between checks. |
120-
| `successThreshold` | integer | Minimum number of times the check needs to pass for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness Probe. |
121-
| `timeoutSeconds` | integer | The number of seconds with no response that indicates a failure. |
122-
123102
### Shutdown
124103

125104
| Name | Type | Description |

‎documentation/domains/Domain.json

Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,68 +1006,6 @@
10061006
}
10071007
}
10081008
},
1009-
"ProbeTuning": {
1010-
"type": "object",
1011-
"properties": {
1012-
"failureThreshold": {
1013-
"default": 1,
1014-
"description": "Number of times the check is performed before giving up. Giving up in case of liveness probe means restarting the container. In case of readiness probe, the Pod will be marked Unready. Defaults to 1.",
1015-
"type": "integer",
1016-
"minimum": 1
1017-
},
1018-
"periodSeconds": {
1019-
"description": "The number of seconds between checks.",
1020-
"type": "integer"
1021-
},
1022-
"timeoutSeconds": {
1023-
"description": "The number of seconds with no response that indicates a failure.",
1024-
"type": "integer"
1025-
},
1026-
"successThreshold": {
1027-
"default": 1,
1028-
"description": "Minimum number of times the check needs to pass for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness Probe.",
1029-
"type": "integer",
1030-
"minimum": 1
1031-
},
1032-
"initialDelaySeconds": {
1033-
"description": "The number of seconds before the first check is performed.",
1034-
"type": "integer"
1035-
}
1036-
}
1037-
},
1038-
"ReadinessProbe": {
1039-
"type": "object",
1040-
"properties": {
1041-
"failureThreshold": {
1042-
"default": 1,
1043-
"description": "Number of times the check is performed before giving up. Giving up in case of liveness probe means restarting the container. In case of readiness probe, the Pod will be marked Unready. Defaults to 1.",
1044-
"type": "integer",
1045-
"minimum": 1
1046-
},
1047-
"httpGetActionPath": {
1048-
"description": "Path to access for the readiness probe. Defaults to /weblogic/ready",
1049-
"type": "string"
1050-
},
1051-
"periodSeconds": {
1052-
"description": "The number of seconds between checks.",
1053-
"type": "integer"
1054-
},
1055-
"timeoutSeconds": {
1056-
"description": "The number of seconds with no response that indicates a failure.",
1057-
"type": "integer"
1058-
},
1059-
"successThreshold": {
1060-
"default": 1,
1061-
"description": "Minimum number of times the check needs to pass for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness Probe.",
1062-
"type": "integer",
1063-
"minimum": 1
1064-
},
1065-
"initialDelaySeconds": {
1066-
"description": "The number of seconds before the first check is performed.",
1067-
"type": "integer"
1068-
}
1069-
}
1070-
},
10711009
"ServerHealth": {
10721010
"type": "object",
10731011
"properties": {
@@ -1154,8 +1092,8 @@
11541092
}
11551093
},
11561094
"readinessProbe": {
1157-
"description": "Settings for the readiness probe associated with a WebLogic Server instance.",
1158-
"$ref": "#/definitions/ReadinessProbe"
1095+
"description": "Settings for the readiness probe associated with a WebLogic Server instance. If not specified, the operator will create an HTTP probe accessing the /weblogic/ready path. If an HTTP probe is specified then the operator will fill in `path`, `port`, and `scheme`, if they are missing. The operator will also fill in any missing tuning-related fields if they are unspecified. Tuning-related fields will be inherited from the domain and cluster scopes unless a more specific scope defines a different action, such as a different HTTP path to access.",
1096+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Probe"
11591097
},
11601098
"containerSecurityContext": {
11611099
"description": "Container-level security attributes. Will override any matching Pod-level attributes. See `kubectl explain pods.spec.containers.securityContext`. Beginning with operator version 4.0.5, if no value is specified for this field, the operator will use default content for container-level `securityContext`. More info: https://oracle.github.io/weblogic-kubernetes-operator/security/domain-security/pod-and-container/.",
@@ -1177,8 +1115,8 @@
11771115
"type": "integer"
11781116
},
11791117
"livenessProbe": {
1180-
"description": "Settings for the liveness probe associated with a WebLogic Server instance.",
1181-
"$ref": "#/definitions/ProbeTuning"
1118+
"description": "Settings for the liveness probe associated with a WebLogic Server instance. If not specified, the operator will create a probe that executes a script provided by the operator. The operator will also fill in any missing tuning-related fields, if they are unspecified. Tuning-related fields will be inherited from the domain and cluster scopes unless a more specific scope defines a different action, such as a different script to execute.",
1119+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Probe"
11821120
},
11831121
"topologySpreadConstraints": {
11841122
"description": "TopologySpreadConstraints describes how a group of pods ought to spread across topology domains. Scheduler will schedule pods in a way which abides by the constraints. All topologySpreadConstraints are ANDed.",

0 commit comments

Comments
 (0)