Skip to content

Commit e9429f3

Browse files
committed
Merge branch 'readiness-get-action' into 'main'
Support customization of readiness probe get action See merge request weblogic-cloud/weblogic-kubernetes-operator!4654 (cherry picked from commit 7a76a1b) c0658b2 Support customization of readiness probe get action 68c9bc6 Update solution to use full standard probe schema 2d20af9 Correct JSON documentation references 2ccb976 Use builder to prevent modifying original
1 parent dc99647 commit e9429f3

File tree

25 files changed

+19116
-716
lines changed

25 files changed

+19116
-716
lines changed

documentation/domains/Cluster.json

Lines changed: 19 additions & 94 deletions
Large diffs are not rendered by default.

documentation/domains/Cluster.md

Lines changed: 18 additions & 43 deletions
Large diffs are not rendered by default.

documentation/domains/Domain.json

Lines changed: 38 additions & 113 deletions
Large diffs are not rendered by default.

documentation/domains/Domain.md

Lines changed: 36 additions & 61 deletions
Large diffs are not rendered by default.

documentation/domains/k8s1.13.5.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,21 @@ HostAlias holds the mapping between IP and hostnames that will be injected as an
109109
| `hostnames` | Array of string | Hostnames for the above IP address. |
110110
| `ip` | string | IP address of the host file entry. |
111111

112+
### Probe
113+
114+
Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic.
115+
116+
| Name | Type | Description |
117+
| --- | --- | --- |
118+
| `exec` | [Exec Action](#exec-action) | One and only one of the following should be specified. Exec specifies the action to take. |
119+
| `failureThreshold` | integer | Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. |
120+
| `httpGet` | [HTTP Get Action](#http-get-action) | HTTPGet specifies the http request to perform. |
121+
| `initialDelaySeconds` | integer | Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes |
122+
| `periodSeconds` | integer | How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. |
123+
| `successThreshold` | integer | Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. |
124+
| `tcpSocket` | [TCP Socket Action](#tcp-socket-action) | TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported |
125+
| `timeoutSeconds` | integer | Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes |
126+
112127
### Pod Security Context
113128

114129
PodSecurityContext holds pod-level security attributes and common container settings. Some fields are also present in container.securityContext. Field values of container.securityContext take precedence over field values of PodSecurityContext.
@@ -308,6 +323,21 @@ A label selector is a label query over a set of resources. The result of matchLa
308323
| Name | Type | Description |
309324
| --- | --- | --- |
310325

326+
### Exec Action
327+
328+
| Name | Type | Description |
329+
| --- | --- | --- |
330+
331+
### HTTP Get Action
332+
333+
| Name | Type | Description |
334+
| --- | --- | --- |
335+
336+
### TCP Socket Action
337+
338+
| Name | Type | Description |
339+
| --- | --- | --- |
340+
311341
### Sysctl
312342

313343
| Name | Type | Description |

documentation/domains/k8s1.28.2.md

Lines changed: 538 additions & 0 deletions
Large diffs are not rendered by default.

json-schema-generator/src/main/java/oracle/kubernetes/json/KubernetesSchemaReference.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2019, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2019, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.json;
@@ -10,7 +10,7 @@
1010

1111
public class KubernetesSchemaReference {
1212
private static final String K8S_SCHEMA_URL =
13-
"https://github.com/garethr/kubernetes-json-schema/blob/master/v%s/_definitions.json";
13+
"https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v%s/_definitions.json";
1414
private static final String K8S_SCHEMA_CACHE = "caches/kubernetes-%s.json";
1515
private static final String K8S_MARKDOWN_LINK = "k8s%s.md";
1616

json-schema-generator/src/main/resources/oracle/kubernetes/json/caches/kubernetes-1.28.2.json

Lines changed: 17775 additions & 0 deletions
Large diffs are not rendered by default.

json-schema-generator/src/test/java/oracle/kubernetes/json/SchemaGeneratorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2018, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.json;
@@ -27,7 +27,7 @@
2727
class SchemaGeneratorTest {
2828

2929
private static final String K8S_SCHEMA_URL =
30-
"https://github.com/garethr/kubernetes-json-schema/blob/master/v1.9.0/_definitions.json";
30+
"https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.9.0/_definitions.json";
3131
private static final String K8S_CACHE_FILE = "caches/kubernetes-1.9.0.json";
3232
private final SchemaGenerator generator = new SchemaGenerator();
3333

json-schema-generator/src/test/java/oracle/kubernetes/json/YamlDocGeneratorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2019, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2019, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.json;
@@ -20,7 +20,7 @@
2020
import static org.hamcrest.junit.MatcherAssert.assertThat;
2121

2222
class YamlDocGeneratorTest {
23-
private static final String K8S_VERSION = "1.13.5";
23+
private static final String K8S_VERSION = "1.28.2";
2424
private final SchemaGenerator schemaGenerator = new SchemaGenerator();
2525
@SuppressWarnings("unused")
2626
@Description("An annotated field")

0 commit comments

Comments
 (0)