Skip to content

Commit 85d783d

Browse files
rjeberhardrjeberhard
committed
Model in image out of Java
1 parent fe84504 commit 85d783d

File tree

8 files changed

+19675
-20018
lines changed

8 files changed

+19675
-20018
lines changed

‎docs/domains/Domain.json

Lines changed: 60 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -172,34 +172,6 @@
172172
}
173173
}
174174
},
175-
"Configuration": {
176-
"type": "object",
177-
"properties": {
178-
"opss": {
179-
"description": "Configuration for OPSS security.",
180-
"$ref": "#/definitions/Opss"
181-
},
182-
"model": {
183-
"description": "Model in image model files and properties.",
184-
"$ref": "#/definitions/Model"
185-
},
186-
"secrets": {
187-
"description": "A list of names of the secrets for WebLogic configuration overrides or model. If this field is specified it overrides the value of spec.configOverrideSecrets.",
188-
"type": "array",
189-
"items": {
190-
"type": "string"
191-
}
192-
},
193-
"overridesConfigMap": {
194-
"description": "The name of the config map for WebLogic configuration overrides. If this field is specified it overrides the value of spec.configOverrides.",
195-
"type": "string"
196-
},
197-
"introspectorJobActiveDeadlineSeconds": {
198-
"description": "The introspector job timeout value in seconds. If this field is specified it overrides the Operator\u0027s config map data.introspectorJobActiveDeadlineSeconds value.",
199-
"type": "number"
200-
}
201-
}
202-
},
203175
"DateTime": {
204176
"format": "date-time",
205177
"type": "string"
@@ -242,78 +214,6 @@
242214
"description": "DomainSpec is a description of a domain.",
243215
"type": "object",
244216
"properties": {
245-
"configuration": {
246-
"description": "Models and overrides affecting the WebLogic domain configuration.",
247-
"$ref": "#/definitions/Configuration"
248-
},
249-
"configOverrideSecrets": {
250-
"deprecated": "true",
251-
"description": "Deprecated. Use configuration.secrets instead. Ignored if configuration.secrets is specified. A list of names of the secrets for optional WebLogic configuration overrides.",
252-
"type": "array",
253-
"items": {
254-
"type": "string"
255-
}
256-
},
257-
"imagePullSecrets": {
258-
"description": "A list of image pull secrets for the WebLogic Docker image.",
259-
"type": "array",
260-
"items": {
261-
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.LocalObjectReference"
262-
}
263-
},
264-
"domainUID": {
265-
"pattern": "^[a-z0-9-.]{1,253}$",
266-
"description": "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name.",
267-
"type": "string"
268-
},
269-
"experimental": {
270-
"description": "Experimental feature configurations.",
271-
"$ref": "#/definitions/Experimental"
272-
},
273-
"serverService": {
274-
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic Server instances.",
275-
"$ref": "#/definitions/ServerService"
276-
},
277-
"domainHome": {
278-
"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.",
279-
"type": "string"
280-
},
281-
"domainHomeSourceType": {
282-
"description": "Domain home file system source type: Legal values: Image, PersistentVolume, FromModel. Image indicates that the domain home file system is contained in the Docker 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.",
283-
"type": "string",
284-
"enum": [
285-
"Image",
286-
"PersistentVolume",
287-
"FromModel"
288-
]
289-
},
290-
"httpAccessLogInLogHome": {
291-
"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.",
292-
"type": "boolean"
293-
},
294-
"webLogicCredentialsSecret": {
295-
"description": "The name of a pre-created Kubernetes secret, in the domain\u0027s namespace, that holds the username and password needed to boot WebLogic Server under the \u0027username\u0027 and \u0027password\u0027 fields.",
296-
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecretReference"
297-
},
298-
"adminServer": {
299-
"description": "Configuration for the Administration Server.",
300-
"$ref": "#/definitions/AdminServer"
301-
},
302-
"logHome": {
303-
"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.",
304-
"type": "string"
305-
},
306-
"includeServerOutInPodLog": {
307-
"description": "If true (the default), then the server .out file will be included in the pod\u0027s stdout.",
308-
"type": "boolean"
309-
},
310-
"clusters": {
311-
"description": "Configuration for the clusters.",
312-
"type": "array",
313-
"items": {
314-
"$ref": "#/definitions/Cluster"
315-
}
316-
},
317217
"serverStartState": {
318218
"description": "The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING.",
319219
"type": "string",
@@ -340,11 +240,33 @@
340240
"type": "number",
341241
"minimum": 0
342242
},
243+
"configOverrideSecrets": {
244+
"description": "A list of names of the secrets for optional WebLogic configuration overrides.",
245+
"type": "array",
246+
"items": {
247+
"type": "string"
248+
}
249+
},
250+
"imagePullSecrets": {
251+
"description": "A list of image pull secrets for the WebLogic Docker image.",
252+
"type": "array",
253+
"items": {
254+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.LocalObjectReference"
255+
}
256+
},
343257
"domainHomeInImage": {
344-
"deprecated": "true",
345-
"description": "Deprecated. Use domainHomeSourceType instead. Ignored if domainHomeSourceType is specified. 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.",
258+
"description": "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.",
346259
"type": "boolean"
347260
},
261+
"domainUID": {
262+
"pattern": "^[a-z0-9-.]{1,253}$",
263+
"description": "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name.",
264+
"type": "string"
265+
},
266+
"experimental": {
267+
"description": "Experimental feature configurations.",
268+
"$ref": "#/definitions/Experimental"
269+
},
348270
"serverStartPolicy": {
349271
"description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.",
350272
"type": "string",
@@ -358,33 +280,63 @@
358280
"description": "If present, every time this value is updated the operator will restart the required servers.",
359281
"type": "string"
360282
},
361-
"introspectVersion": {
362-
"description": "If present, every time this value is updated, the operator will start introspect domain job",
363-
"type": "string"
364-
},
365283
"dataHome": {
366284
"description": "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.",
367285
"type": "string"
368286
},
369287
"configOverrides": {
370-
"deprecated": "true",
371-
"description": "Deprecated. Use configuration.overridesConfigMap instead. Ignored if configuration.overridesConfigMap is specified. The name of the config map for optional WebLogic configuration overrides.",
288+
"description": "The name of the config map for optional WebLogic configuration overrides.",
289+
"type": "string"
290+
},
291+
"serverService": {
292+
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic Server instances.",
293+
"$ref": "#/definitions/ServerService"
294+
},
295+
"domainHome": {
296+
"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.",
372297
"type": "string"
373298
},
374299
"logHomeEnabled": {
375300
"description": "Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeSourceType is PersistentVolume; false, otherwise.",
376301
"type": "boolean"
377302
},
303+
"httpAccessLogInLogHome": {
304+
"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.",
305+
"type": "boolean"
306+
},
307+
"webLogicCredentialsSecret": {
308+
"description": "The name of a pre-created Kubernetes secret, in the domain\u0027s namespace, that holds the username and password needed to boot WebLogic Server under the \u0027username\u0027 and \u0027password\u0027 fields.",
309+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecretReference"
310+
},
311+
"adminServer": {
312+
"description": "Configuration for the Administration Server.",
313+
"$ref": "#/definitions/AdminServer"
314+
},
378315
"serverPod": {
379316
"description": "Configuration affecting server pods.",
380317
"$ref": "#/definitions/ServerPod"
381318
},
319+
"logHome": {
320+
"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.",
321+
"type": "string"
322+
},
323+
"includeServerOutInPodLog": {
324+
"description": "If true (the default), then the server .out file will be included in the pod\u0027s stdout.",
325+
"type": "boolean"
326+
},
382327
"managedServers": {
383328
"description": "Configuration for individual Managed Servers.",
384329
"type": "array",
385330
"items": {
386331
"$ref": "#/definitions/ManagedServer"
387332
}
333+
},
334+
"clusters": {
335+
"description": "Configuration for the clusters.",
336+
"type": "array",
337+
"items": {
338+
"$ref": "#/definitions/Cluster"
339+
}
388340
}
389341
}
390342
},
@@ -515,41 +467,6 @@
515467
},
516468
"type": "object"
517469
},
518-
"Model": {
519-
"type": "object",
520-
"properties": {
521-
"runtimeEncryptionSecret": {
522-
"description": "Runtime encryption secret. Required when domainHomeSourceType is set to FromModel.",
523-
"type": "string"
524-
},
525-
"domainType": {
526-
"description": "WDT domain type: Legal values: WLS, RestrictedJRF, JRF. Defaults to WLS.",
527-
"type": "string",
528-
"enum": [
529-
"WLS",
530-
"RestrictedJRF",
531-
"JRF"
532-
]
533-
},
534-
"configMap": {
535-
"description": "WDT config map name.",
536-
"type": "string"
537-
}
538-
}
539-
},
540-
"Opss": {
541-
"type": "object",
542-
"properties": {
543-
"walletFileSecret": {
544-
"description": "Secret containing the OPSS key wallet file.",
545-
"type": "string"
546-
},
547-
"walletPasswordSecret": {
548-
"description": "Secret containing OPSS key passphrase.",
549-
"type": "string"
550-
}
551-
}
552-
},
553470
"ProbeTuning": {
554471
"type": "object",
555472
"properties": {

‎docs/domains/Domain.md

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,18 @@ DomainSpec is a description of a domain.
1818
| --- | --- | --- |
1919
| `adminServer` | [Admin Server](#admin-server) | Configuration for the Administration Server. |
2020
| `clusters` | array of [Cluster](#cluster) | Configuration for the clusters. |
21-
| `configOverrides` | string | Deprecated. Use configuration.overridesConfigMap instead. Ignored if configuration.overridesConfigMap is specified. The name of the config map for optional WebLogic configuration overrides. |
22-
| `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. |
23-
| `configuration` | [Configuration](#configuration) | Models and overrides affecting the WebLogic domain configuration. |
21+
| `configOverrides` | string | The name of the config map for optional WebLogic configuration overrides. |
22+
| `configOverrideSecrets` | array of string | A list of names of the secrets for optional WebLogic configuration overrides. |
2423
| `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. |
2524
| `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. |
26-
| `domainHomeInImage` | Boolean | Deprecated. Use domainHomeSourceType instead. Ignored if domainHomeSourceType is specified. 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. |
27-
| `domainHomeSourceType` | string | Domain home file system source type: Legal values: Image, PersistentVolume, FromModel. Image indicates that the domain home file system is contained in the Docker 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. |
25+
| `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. |
2826
| `domainUID` | string | Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name. |
2927
| `experimental` | [Experimental](#experimental) | Experimental feature configurations. |
3028
| `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. |
3129
| `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. |
3230
| `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. |
3331
| `imagePullSecrets` | array of [Local Object Reference](k8s1.13.5.md#local-object-reference) | A list of image pull secrets for the WebLogic Docker image. |
3432
| `includeServerOutInPodLog` | Boolean | If true (the default), then the server .out file will be included in the pod's stdout. |
35-
| `introspectVersion` | string | If present, every time this value is updated, the operator will start introspect domain job |
3633
| `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. |
3734
| `logHomeEnabled` | Boolean | Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeSourceType is PersistentVolume; false, otherwise. |
3835
| `managedServers` | array of [Managed Server](#managed-server) | Configuration for individual Managed Servers. |
@@ -88,16 +85,6 @@ An element representing a cluster in the domain configuration.
8885
| `serverStartPolicy` | string | The strategy for deciding whether to start a server. Legal values are NEVER, or IF_NEEDED. |
8986
| `serverStartState` | string | The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING. |
9087

91-
### Configuration
92-
93-
| Name | Type | Description |
94-
| --- | --- | --- |
95-
| `introspectorJobActiveDeadlineSeconds` | number | The introspector job timeout value in seconds. If this field is specified it overrides the Operator's config map data.introspectorJobActiveDeadlineSeconds value. |
96-
| `model` | [Model](#model) | Model in image model files and properties. |
97-
| `opss` | [Opss](#opss) | Configuration for OPSS security. |
98-
| `overridesConfigMap` | string | The name of the config map for WebLogic configuration overrides. If this field is specified it overrides the value of spec.configOverrides. |
99-
| `secrets` | array of string | A list of names of the secrets for WebLogic configuration overrides or model. If this field is specified it overrides the value of spec.configOverrideSecrets. |
100-
10188
### Experimental
10289

10390
| Name | Type | Description |
@@ -203,21 +190,6 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
203190
| `annotations` | Map | The annotations to be attached to generated resources. |
204191
| `labels` | Map | The labels to be attached to generated resources. The label names must not start with 'weblogic.'. |
205192

206-
### Model
207-
208-
| Name | Type | Description |
209-
| --- | --- | --- |
210-
| `configMap` | string | WDT config map name. |
211-
| `domainType` | string | WDT domain type: Legal values: WLS, RestrictedJRF, JRF. Defaults to WLS. |
212-
| `runtimeEncryptionSecret` | string | Runtime encryption secret. Required when domainHomeSourceType is set to FromModel. |
213-
214-
### Opss
215-
216-
| Name | Type | Description |
217-
| --- | --- | --- |
218-
| `walletFileSecret` | string | Secret containing the OPSS key wallet file. |
219-
| `walletPasswordSecret` | string | Secret containing OPSS key passphrase. |
220-
221193
### Istio
222194

223195
| Name | Type | Description |

0 commit comments

Comments
 (0)