Skip to content

Commit b6b7bfa

Browse files
rjeberhardrjeberhard
committed
Remove DomainSpec schema items added in 3.0
1 parent cac071d commit b6b7bfa

File tree

8 files changed

+41
-117
lines changed

8 files changed

+41
-117
lines changed

‎docs/domains/Domain.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
]
220220
},
221221
"image": {
222-
"description": "The WebLogic Docker image; required when domainHomeSourceType is Image or FromModel; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.",
222+
"description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.",
223223
"type": "string"
224224
},
225225
"imagePullPolicy": {
@@ -289,15 +289,11 @@
289289
"$ref": "#/definitions/ServerService"
290290
},
291291
"domainHome": {
292-
"description": "The folder for the WebLogic Domain. Not required. 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.",
292+
"description": "The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false. Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true.",
293293
"type": "string"
294294
},
295295
"logHomeEnabled": {
296-
"description": "Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeSourceType is PersistentVolume; false, otherwise.",
297-
"type": "boolean"
298-
},
299-
"httpAccessLogInLogHome": {
300-
"description": "If true (the default), then server HTTP access log files will be written to the same directory specified in `logHome`. Otherwise, server HTTP access log files will be written to the directory configured in the WebLogic domain home configuration.",
296+
"description": "Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeInImage is false. Defaults to false if domainHomeInImage is true. ",
301297
"type": "boolean"
302298
},
303299
"webLogicCredentialsSecret": {
@@ -313,7 +309,7 @@
313309
"$ref": "#/definitions/ServerPod"
314310
},
315311
"logHome": {
316-
"description": "The in-pod name of the directory in which to store the domain, Node Manager, server logs, server *.out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Ignored if logHomeEnabled is false.",
312+
"description": "The in-pod name of the directory in which to store the domain, Node Manager, server logs, and server *.out files",
317313
"type": "string"
318314
},
319315
"includeServerOutInPodLog": {

‎docs/domains/Domain.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,16 @@ DomainSpec is a description of a domain.
2121
| `configOverrides` | string | The name of the config map for optional WebLogic configuration overrides. |
2222
| `configOverrideSecrets` | array of string | A list of names of the secrets for optional WebLogic configuration overrides. |
2323
| `dataHome` | string | An optional, in-pod location for data storage of default and custom file stores. If dataHome is not specified or its value is either not set or empty (e.g. dataHome: "") then the data storage directories are determined from the WebLogic domain home configuration. |
24-
| `domainHome` | string | The folder for the WebLogic Domain. Not required. 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. |
24+
| `domainHome` | string | The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false. Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true. |
2525
| `domainHomeInImage` | Boolean | True indicates that the domain home file system is contained in the Docker image specified by the image field. False indicates that the domain home file system is located on a persistent volume. |
2626
| `domainUID` | string | Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name. |
2727
| `experimental` | [Experimental](#experimental) | Experimental feature configurations. |
28-
| `httpAccessLogInLogHome` | Boolean | If true (the default), then server HTTP access log files will be written to the same directory specified in `logHome`. Otherwise, server HTTP access log files will be written to the directory configured in the WebLogic domain home configuration. |
29-
| `image` | string | The WebLogic Docker image; required when domainHomeSourceType is Image or FromModel; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4. |
28+
| `image` | string | The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4. |
3029
| `imagePullPolicy` | string | The image pull policy for the WebLogic Docker image. Legal values are Always, Never and IfNotPresent. Defaults to Always if image ends in :latest, IfNotPresent otherwise. |
3130
| `imagePullSecrets` | array of [Local Object Reference](k8s1.13.5.md#local-object-reference) | A list of image pull secrets for the WebLogic Docker image. |
3231
| `includeServerOutInPodLog` | Boolean | If true (the default), then the server .out file will be included in the pod's stdout. |
33-
| `logHome` | string | The in-pod name of the directory in which to store the domain, Node Manager, server logs, server *.out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Ignored if logHomeEnabled is false. |
34-
| `logHomeEnabled` | Boolean | Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeSourceType is PersistentVolume; false, otherwise. |
32+
| `logHome` | string | The in-pod name of the directory in which to store the domain, Node Manager, server logs, and server *.out files |
33+
| `logHomeEnabled` | Boolean | Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeInImage is false. Defaults to false if domainHomeInImage is true. |
3534
| `managedServers` | array of [Managed Server](#managed-server) | Configuration for individual Managed Servers. |
3635
| `replicas` | number | The number of managed servers to run in any cluster that does not specify a replica count. |
3736
| `restartVersion` | string | If present, every time this value is updated the operator will restart the required servers. |

‎docs/domains/index.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@
11391139
]
11401140
},
11411141
"image": {
1142-
"description": "The WebLogic Docker image; required when domainHomeSourceType is Image or FromModel; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.",
1142+
"description": "The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.",
11431143
"type": "string"
11441144
},
11451145
"imagePullPolicy": {
@@ -1209,15 +1209,11 @@
12091209
"$ref": "#/definitions/ServerService"
12101210
},
12111211
"domainHome": {
1212-
"description": "The folder for the WebLogic Domain. Not required. 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.",
1212+
"description": "The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false. Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true.",
12131213
"type": "string"
12141214
},
12151215
"logHomeEnabled": {
1216-
"description": "Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeSourceType is PersistentVolume; false, otherwise.",
1217-
"type": "boolean"
1218-
},
1219-
"httpAccessLogInLogHome": {
1220-
"description": "If true (the default), then server HTTP access log files will be written to the same directory specified in `logHome`. Otherwise, server HTTP access log files will be written to the directory configured in the WebLogic domain home configuration.",
1216+
"description": "Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeInImage is false. Defaults to false if domainHomeInImage is true. ",
12211217
"type": "boolean"
12221218
},
12231219
"webLogicCredentialsSecret": {
@@ -1233,7 +1229,7 @@
12331229
"$ref": "#/definitions/ServerPod"
12341230
},
12351231
"logHome": {
1236-
"description": "The in-pod name of the directory in which to store the domain, Node Manager, server logs, server *.out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Ignored if logHomeEnabled is false.",
1232+
"description": "The in-pod name of the directory in which to store the domain, Node Manager, server logs, and server *.out files",
12371233
"type": "string"
12381234
},
12391235
"includeServerOutInPodLog": {

‎kubernetes/crd/domain-crd.yaml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ spec:
3434
- ADMIN
3535
image:
3636
type: string
37-
description: The WebLogic Docker image; required when domainHomeSourceType
38-
is Image or FromModel; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.
37+
description: The WebLogic Docker image; required when domainHomeInImage
38+
is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.
3939
imagePullPolicy:
4040
type: string
4141
description: The image pull policy for the WebLogic Docker image.
@@ -140,21 +140,14 @@ spec:
140140
domainHome:
141141
type: string
142142
description: The folder for the WebLogic Domain. Not required. Defaults
143-
to /shared/domains/domains/<domainUID> if domainHomeSourceType is
144-
PersistentVolume. Defaults to /u01/oracle/user_projects/domains/
145-
if domainHomeSourceType is Image. Defaults to /u01/domains/<domainUID>
146-
if domainHomeSourceType is FromModel.
143+
to /shared/domains/domains/domainUID if domainHomeInImage is false.
144+
Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage
145+
is true.
147146
logHomeEnabled:
148147
type: boolean
149-
description: Specified whether the log home folder is enabled. Not
150-
required. Defaults to true if domainHomeSourceType is PersistentVolume;
151-
false, otherwise.
152-
httpAccessLogInLogHome:
153-
type: boolean
154-
description: If true (the default), then server HTTP access log files
155-
will be written to the same directory specified in `logHome`. Otherwise,
156-
server HTTP access log files will be written to the directory configured
157-
in the WebLogic domain home configuration.
148+
description: 'Specified whether the log home folder is enabled. Not
149+
required. Defaults to true if domainHomeInImage is false. Defaults
150+
to false if domainHomeInImage is true. '
158151
webLogicCredentialsSecret:
159152
type: object
160153
description: The name of a pre-created Kubernetes secret, in the domain's
@@ -10419,9 +10412,7 @@ spec:
1041910412
logHome:
1042010413
type: string
1042110414
description: The in-pod name of the directory in which to store the
10422-
domain, Node Manager, server logs, server *.out, and optionally
10423-
HTTP access log files if `httpAccessLogInLogHome` is true. Ignored
10424-
if logHomeEnabled is false.
10415+
domain, Node Manager, server logs, and server *.out files
1042510416
includeServerOutInPodLog:
1042610417
type: boolean
1042710418
description: If true (the default), then the server .out file will

‎kubernetes/crd/domain-v1beta1-crd.yaml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ spec:
3737
- ADMIN
3838
image:
3939
type: string
40-
description: The WebLogic Docker image; required when domainHomeSourceType
41-
is Image or FromModel; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.
40+
description: The WebLogic Docker image; required when domainHomeInImage
41+
is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.4.
4242
imagePullPolicy:
4343
type: string
4444
description: The image pull policy for the WebLogic Docker image. Legal
@@ -142,21 +142,14 @@ spec:
142142
domainHome:
143143
type: string
144144
description: The folder for the WebLogic Domain. Not required. Defaults
145-
to /shared/domains/domains/<domainUID> if domainHomeSourceType is
146-
PersistentVolume. Defaults to /u01/oracle/user_projects/domains/ if
147-
domainHomeSourceType is Image. Defaults to /u01/domains/<domainUID>
148-
if domainHomeSourceType is FromModel.
145+
to /shared/domains/domains/domainUID if domainHomeInImage is false.
146+
Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage
147+
is true.
149148
logHomeEnabled:
150149
type: boolean
151-
description: Specified whether the log home folder is enabled. Not required.
152-
Defaults to true if domainHomeSourceType is PersistentVolume; false,
153-
otherwise.
154-
httpAccessLogInLogHome:
155-
type: boolean
156-
description: If true (the default), then server HTTP access log files
157-
will be written to the same directory specified in `logHome`. Otherwise,
158-
server HTTP access log files will be written to the directory configured
159-
in the WebLogic domain home configuration.
150+
description: 'Specified whether the log home folder is enabled. Not
151+
required. Defaults to true if domainHomeInImage is false. Defaults
152+
to false if domainHomeInImage is true. '
160153
webLogicCredentialsSecret:
161154
type: object
162155
description: The name of a pre-created Kubernetes secret, in the domain's
@@ -10212,9 +10205,7 @@ spec:
1021210205
logHome:
1021310206
type: string
1021410207
description: The in-pod name of the directory in which to store the
10215-
domain, Node Manager, server logs, server *.out, and optionally HTTP
10216-
access log files if `httpAccessLogInLogHome` is true. Ignored if logHomeEnabled
10217-
is false.
10208+
domain, Node Manager, server logs, and server *.out files
1021810209
includeServerOutInPodLog:
1021910210
type: boolean
1022010211
description: If true (the default), then the server .out file will be

‎operator/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,6 @@ public DomainConfigurator withDataHome(String dataHome) {
147147
return this;
148148
}
149149

150-
/**
151-
* Sets whether to write server HTTP access log files to the directory specified in
152-
* logHome.
153-
*
154-
* @param httpAccessLogInLogHome boolean specifying whether to write server HTTP
155-
* access log files to the logHome directory
156-
* @return this object
157-
*/
158-
public DomainConfigurator withHttpAccessLogInLogHome(boolean httpAccessLogInLogHome) {
159-
getDomainSpec().withHttpAccessLogInLogHome(httpAccessLogInLogHome);
160-
return this;
161-
}
162-
163150
/**
164151
* Sets the WebLogic configuration overrides configmap name for the domain.
165152
*

0 commit comments

Comments
 (0)