Skip to content

Commit bc5edf3

Browse files
rjeberhardrjeberhard
authored
Merge pull request #755 from oracle/final-2.0-schema
Final 2.0 schema
2 parents 7666624 + b3083fd commit bc5edf3

File tree

68 files changed

+1452
-1708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1452
-1708
lines changed

‎docs/domains/Domain.json

Lines changed: 93 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,28 @@
66
"type": "object",
77
"properties": {
88
"serverStartState": {
9-
"description": "The state in which the server is to be started. Use ADMIN if server should start in admin state. Defaults to RUNNING.",
9+
"description": "The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING.",
1010
"type": "string",
1111
"enum": [
1212
"RUNNING",
1313
"ADMIN"
1414
]
1515
},
16-
"nodePortAnnotations": {
17-
"$ref": "#/definitions/Map"
16+
"serverService": {
17+
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
18+
"$ref": "#/definitions/KubernetesResource"
1819
},
1920
"serverPod": {
20-
"description": "Configuration affecting the server pod",
21+
"description": "Configuration affecting server pods",
2122
"$ref": "#/definitions/ServerPod"
2223
},
23-
"exportedNetworkAccessPoints": {
24-
"description": "T3 network access points to export",
25-
"$ref": "#/definitions/Map"
26-
},
27-
"nodePortLabels": {
28-
"$ref": "#/definitions/Map"
29-
},
30-
"nodePort": {
31-
"type": "number"
32-
},
3324
"serverStartPolicy": {
34-
"description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, ALWAYS, or IF_NEEDED.",
25+
"description": "The strategy for deciding whether to start a server. Legal values are ALWAYS, NEVER, or IF_NEEDED.",
3526
"type": "string",
3627
"enum": [
37-
"NEVER",
3828
"ALWAYS",
39-
"IF_NEEDED",
40-
"ADMIN_ONLY"
29+
"NEVER",
30+
"IF_NEEDED"
4131
]
4232
},
4333
"restartVersion": {
@@ -54,16 +44,30 @@
5444
"type": "object",
5545
"properties": {
5646
"channels": {
57-
"$ref": "#/definitions/Map"
58-
},
59-
"annotations": {
60-
"$ref": "#/definitions/Map"
61-
},
62-
"labels": {
63-
"$ref": "#/definitions/Map"
47+
"description": "Specifies which of the admin server\u0027s WebLogic channels should be exposed outside the Kubernetes cluster via a node port service, along with the node port for each channel. If not specified, the admin server\u0027s node port service will not be created.",
48+
"type": "array",
49+
"items": {
50+
"$ref": "#/definitions/Channel"
51+
}
6452
}
6553
}
6654
},
55+
"Channel": {
56+
"type": "object",
57+
"properties": {
58+
"channelName": {
59+
"description": "Name of channel. default\u0027 refers to the admin server\u0027s default channel (configured via the ServerMBean\u0027s ListenPort) \u0027default-secure\u0027 refers to the admin server\u0027s default secure channel (configured via the ServerMBean\u0027s SSLMBean\u0027s ListenPort) \u0027default-admin\u0027 refers to the admin server\u0027s default administrative channel (configured via the DomainMBean\u0027s AdministrationPort) Otherwise, the name is the name of one of the admin server\u0027s network access points (configured via the ServerMBean\u0027s NetworkAccessMBeans).",
60+
"type": "string"
61+
},
62+
"nodePort": {
63+
"description": "Specifies the port number used to access the WebLogic channel outside of the Kubernetes cluster. If not specified, defaults to the port defined by the WebLogic channel.",
64+
"type": "number"
65+
}
66+
},
67+
"required": [
68+
"channelName"
69+
]
70+
},
6771
"Chronology": {
6872
"type": "object",
6973
"properties": {}
@@ -72,15 +76,19 @@
7276
"type": "object",
7377
"properties": {
7478
"serverStartState": {
75-
"description": "The state in which the server is to be started. Use ADMIN if server should start in admin state. Defaults to RUNNING.",
79+
"description": "The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING.",
7680
"type": "string",
7781
"enum": [
7882
"RUNNING",
7983
"ADMIN"
8084
]
8185
},
86+
"serverService": {
87+
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
88+
"$ref": "#/definitions/KubernetesResource"
89+
},
8290
"maxUnavailable": {
83-
"description": "The maximum number of cluster membrers that can be temporarily unavailable. Defaults to 1.",
91+
"description": "The maximum number of cluster members that can be temporarily unavailable. Defaults to 1.",
8492
"type": "number",
8593
"minimum": 1
8694
},
@@ -94,17 +102,19 @@
94102
"type": "string"
95103
},
96104
"serverPod": {
97-
"description": "Configuration affecting the server pod",
105+
"description": "Configuration affecting server pods",
98106
"$ref": "#/definitions/ServerPod"
99107
},
108+
"clusterService": {
109+
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic cluster.",
110+
"$ref": "#/definitions/KubernetesResource"
111+
},
100112
"serverStartPolicy": {
101-
"description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, ALWAYS, or IF_NEEDED.",
113+
"description": "The strategy for deciding whether to start a server. Legal values are NEVER, or IF_NEEDED.",
102114
"type": "string",
103115
"enum": [
104116
"NEVER",
105-
"ALWAYS",
106-
"IF_NEEDED",
107-
"ADMIN_ONLY"
117+
"IF_NEEDED"
108118
]
109119
},
110120
"restartVersion": {
@@ -157,7 +167,7 @@
157167
"type": "object",
158168
"properties": {
159169
"serverStartState": {
160-
"description": "The state in which the server is to be started. Use ADMIN if server should start in admin state. Defaults to RUNNING.",
170+
"description": "The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING.",
161171
"type": "string",
162172
"enum": [
163173
"RUNNING",
@@ -206,11 +216,10 @@
206216
"type": "string"
207217
},
208218
"serverStartPolicy": {
209-
"description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, ALWAYS, or IF_NEEDED.",
219+
"description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.",
210220
"type": "string",
211221
"enum": [
212222
"NEVER",
213-
"ALWAYS",
214223
"IF_NEEDED",
215224
"ADMIN_ONLY"
216225
]
@@ -220,9 +229,13 @@
220229
"type": "string"
221230
},
222231
"configOverrides": {
223-
"description": "The name of the configmap for optional WebLogic configuration overrides.",
232+
"description": "The name of the config map for optional WebLogic configuration overrides.",
224233
"type": "string"
225234
},
235+
"serverService": {
236+
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
237+
"$ref": "#/definitions/KubernetesResource"
238+
},
226239
"domainHome": {
227240
"description": "The folder for the Weblogic Domain. (Not required)Defaults to /shared/domains/domains/domainUID if domainHomeInImage is falseDefaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true",
228241
"type": "string"
@@ -232,14 +245,15 @@
232245
"type": "boolean"
233246
},
234247
"webLogicCredentialsSecret": {
248+
"description": "The name of a pre-created Kubernetes secret, in the domain\u0027s namepace, that holds the username and password needed to boot WebLogic Server under the \u0027username\u0027 and \u0027password\u0027 fields.",
235249
"$ref": "#/definitions/V1SecretReference"
236250
},
237251
"adminServer": {
238252
"description": "Configuration for the admin server",
239253
"$ref": "#/definitions/AdminServer"
240254
},
241255
"serverPod": {
242-
"description": "Configuration affecting the server pod",
256+
"description": "Configuration affecting server pods",
243257
"$ref": "#/definitions/ServerPod"
244258
},
245259
"logHome": {
@@ -296,42 +310,59 @@
296310
}
297311
}
298312
},
313+
"KubernetesResource": {
314+
"type": "object",
315+
"properties": {
316+
"annotations": {
317+
"description": "The annotations to be attached to generated resources.",
318+
"$ref": "#/definitions/Map"
319+
},
320+
"labels": {
321+
"description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
322+
"$ref": "#/definitions/Map"
323+
}
324+
}
325+
},
299326
"ManagedServer": {
300327
"type": "object",
301328
"properties": {
302329
"serverStartState": {
303-
"description": "The state in which the server is to be started. Use ADMIN if server should start in admin state. Defaults to RUNNING.",
330+
"description": "The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING.",
304331
"type": "string",
305332
"enum": [
306333
"RUNNING",
307334
"ADMIN"
308335
]
309336
},
337+
"serverService": {
338+
"description": "Customization affecting ClusterIP Kubernetes services for WebLogic server instances.",
339+
"$ref": "#/definitions/KubernetesResource"
340+
},
310341
"serverPod": {
311-
"description": "Configuration affecting the server pod",
342+
"description": "Configuration affecting server pods",
312343
"$ref": "#/definitions/ServerPod"
313344
},
314345
"serverName": {
346+
"description": "The name of the server. Required.",
315347
"type": "string"
316348
},
317-
"nodePort": {
318-
"type": "number"
319-
},
320349
"serverStartPolicy": {
321-
"description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, ALWAYS, or IF_NEEDED.",
350+
"description": "The strategy for deciding whether to start a server. Legal values are ALWAYS, NEVER, or IF_NEEDED.",
322351
"type": "string",
323352
"enum": [
324-
"NEVER",
325353
"ALWAYS",
326-
"IF_NEEDED",
327-
"ADMIN_ONLY"
354+
"NEVER",
355+
"IF_NEEDED"
328356
]
329357
},
330358
"restartVersion": {
331359
"description": "If present, every time this value is updated the operator will restart the required servers",
332360
"type": "string"
333361
}
334-
}
362+
},
363+
"required": [
364+
"serverName"
365+
]
335366
},
336367
"Map": {
337368
"type": "object",
@@ -374,10 +405,6 @@
374405
"ServerPod": {
375406
"type": "object",
376407
"properties": {
377-
"serviceLabels": {
378-
"description": "Labels applied to services",
379-
"$ref": "#/definitions/Map"
380-
},
381408
"livenessProbe": {
382409
"description": "Settings for the liveness probe associated with a server",
383410
"$ref": "#/definitions/ProbeTuning"
@@ -393,19 +420,31 @@
393420
"$ref": "#/definitions/V1Volume"
394421
}
395422
},
423+
"annotations": {
424+
"description": "The annotations to be attached to generated resources.",
425+
"$ref": "#/definitions/Map"
426+
},
396427
"resources": {
397428
"description": "Memory and cpu minimum requirements and limits for the server",
398429
"$ref": "#/definitions/V1ResourceRequirements"
399430
},
431+
"readinessProbe": {
432+
"description": "Settings for the readiness probe associated with a server",
433+
"$ref": "#/definitions/ProbeTuning"
434+
},
435+
"containerSecurityContext": {
436+
"description": "Container-level security attributes. Will override any matching pod-level attributes",
437+
"$ref": "#/definitions/V1SecurityContext"
438+
},
400439
"env": {
401440
"description": "A list of environment variables to add to a server",
402441
"type": "array",
403442
"items": {
404443
"$ref": "#/definitions/V1EnvVar"
405444
}
406445
},
407-
"podAnnotations": {
408-
"description": "Annotations applied to pods",
446+
"labels": {
447+
"description": "The labels to be attached to generated resources. The label names must not start with \u0027weblogic.\u0027.",
409448
"$ref": "#/definitions/Map"
410449
},
411450
"nodeSelector": {
@@ -418,22 +457,6 @@
418457
"items": {
419458
"$ref": "#/definitions/V1VolumeMount"
420459
}
421-
},
422-
"podLabels": {
423-
"description": "Labels applied to pods",
424-
"$ref": "#/definitions/Map"
425-
},
426-
"readinessProbe": {
427-
"description": "Settings for the readiness probe associated with a server",
428-
"$ref": "#/definitions/ProbeTuning"
429-
},
430-
"serviceAnnotations": {
431-
"description": "Annotations applied to services",
432-
"$ref": "#/definitions/Map"
433-
},
434-
"containerSecurityContext": {
435-
"description": "Container-level security attributes. Will override any matching pod-level attributes",
436-
"$ref": "#/definitions/V1SecurityContext"
437460
}
438461
}
439462
},
@@ -1612,7 +1635,7 @@
16121635
"type": "string"
16131636
},
16141637
"kind": {
1615-
"description": "The type of resource. Should be \u0027Domain\u0027",
1638+
"description": "The type of resource. Must be \u0027Domain\u0027",
16161639
"type": "string"
16171640
},
16181641
"spec": {

0 commit comments

Comments
 (0)