Skip to content

Commit 5ab6e1a

Browse files
committed
Remove typo second domains directory in default domainHome
1 parent 58d47dc commit 5ab6e1a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

documentation/domains/Domain.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
"$ref": "#/definitions/ServerService"
379379
},
380380
"domainHome": {
381-
"description": "The directory containing the WebLogic domain configuration inside the container. Defaults to /shared/domains/domains/\u003cdomainUID\u003e if `domainHomeSourceType` is PersistentVolume. Defaults to /u01/oracle/user_projects/domains/ if `domainHomeSourceType` is Image. Defaults to /u01/domains/\u003cdomainUID\u003e if `domainHomeSourceType` is FromModel.",
381+
"description": "The directory containing the WebLogic domain configuration inside the container. Defaults to /shared/domains/\u003cdomainUID\u003e if `domainHomeSourceType` is PersistentVolume. Defaults to /u01/oracle/user_projects/domains/ if `domainHomeSourceType` is Image. Defaults to /u01/domains/\u003cdomainUID\u003e if `domainHomeSourceType` is FromModel.",
382382
"type": "string"
383383
},
384384
"domainHomeSourceType": {

documentation/domains/Domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The specification of the operation of the WebLogic domain. Required.
2222
| `configOverrideSecrets` | Array of string | Deprecated. Use `configuration.secrets` instead. Ignored if `configuration.secrets` is specified. A list of names of the Secrets for optional WebLogic configuration overrides. |
2323
| `configuration` | [Configuration](#configuration) | Models and overrides affecting the WebLogic domain configuration. |
2424
| `dataHome` | string | An optional directory in a server's container for data storage of default and custom file stores. If `dataHome` is not specified or its value is either not set or empty, then the data storage directories are determined from the WebLogic domain configuration. |
25-
| `domainHome` | string | The directory containing the WebLogic domain configuration inside the container. Defaults to /shared/domains/domains/<domainUID> if `domainHomeSourceType` is PersistentVolume. Defaults to /u01/oracle/user_projects/domains/ if `domainHomeSourceType` is Image. Defaults to /u01/domains/<domainUID> if `domainHomeSourceType` is FromModel. |
25+
| `domainHome` | string | The directory containing the WebLogic domain configuration inside the container. Defaults to /shared/domains/<domainUID> if `domainHomeSourceType` is PersistentVolume. Defaults to /u01/oracle/user_projects/domains/ if `domainHomeSourceType` is Image. Defaults to /u01/domains/<domainUID> if `domainHomeSourceType` is FromModel. |
2626
| `domainHomeInImage` | Boolean | Deprecated. Use `domainHomeSourceType` instead. Ignored if `domainHomeSourceType` is specified. True indicates that the domain home file system is present in the container image specified by the image field. False indicates that the domain home file system is located on a persistent volume. Defaults to unset. |
2727
| `domainHomeSourceType` | string | Domain home file system source type: Legal values: Image, PersistentVolume, FromModel. Image indicates that the domain home file system is present in the container image specified by the `image` field. PersistentVolume indicates that the domain home file system is located on a persistent volume. FromModel indicates that the domain home file system will be created and managed by the operator based on a WDT domain model. If this field is specified, it overrides the value of `domainHomeInImage`. If both fields are unspecified, then `domainHomeSourceType` defaults to Image. |
2828
| `domainUID` | string | Domain unique identifier. It is recommended that this value be unique to assist in future work to identify related domains in active-passive scenarios across data centers; however, it is only required that this value be unique within the namespace, similarly to the names of Kubernetes resources. This value is distinct and need not match the domain name from the WebLogic domain configuration. Defaults to the value of `metadata.name`. |

kubernetes/crd/domain-crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 62b7ad1ba2e8d59aa1ffe2bc083b55fb25b43bb4939f48f61c4a7973e604d2fa
8+
weblogic.sha256: 386a03c7101614583aa5e1035288ff3bb549df26089200d717d6b871ddf7dc3f
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -304,8 +304,8 @@ spec:
304304
type: object
305305
domainHome:
306306
description: The directory containing the WebLogic domain configuration
307-
inside the container. Defaults to /shared/domains/domains/<domainUID>
308-
if `domainHomeSourceType` is PersistentVolume. Defaults to /u01/oracle/user_projects/domains/
307+
inside the container. Defaults to /shared/domains/<domainUID> if
308+
`domainHomeSourceType` is PersistentVolume. Defaults to /u01/oracle/user_projects/domains/
309309
if `domainHomeSourceType` is Image. Defaults to /u01/domains/<domainUID>
310310
if `domainHomeSourceType` is FromModel.
311311
type: string

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class DomainSpec extends BaseConfiguration {
6161
*/
6262
@Description(
6363
"The directory containing the WebLogic domain configuration inside the container."
64-
+ " Defaults to /shared/domains/domains/<domainUID> if `domainHomeSourceType` is PersistentVolume."
64+
+ " Defaults to /shared/domains/<domainUID> if `domainHomeSourceType` is PersistentVolume."
6565
+ " Defaults to /u01/oracle/user_projects/domains/ if `domainHomeSourceType` is Image."
6666
+ " Defaults to /u01/domains/<domainUID> if `domainHomeSourceType` is FromModel.")
6767
private String domainHome;

0 commit comments

Comments
 (0)