Skip to content

Commit db0e3fa

Browse files
rjeberhardrjeberhard
committed
Fix swagger build
1 parent 2d4fb7b commit db0e3fa

File tree

2 files changed

+47
-35
lines changed

2 files changed

+47
-35
lines changed

‎documentation/domains/index.html

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@
935935
]
936936
},
937937
"serverService": {
938-
"description": "Customization affecting the generation of Kubernetes Services for WebLogic Server instances.",
938+
"description": "Customization affecting the generation of ClusterIP Services for WebLogic Server instances.",
939939
"$ref": "#/definitions/ServerService"
940940
},
941941
"serverPod": {
@@ -952,7 +952,7 @@
952952
]
953953
},
954954
"adminService": {
955-
"description": "Customization affecting the generation of the Kubernetes Service for the Administration Server. These settings can also specify the creation of a second NodePort Service to expose specific channels or network access points outside the Kubernetes cluster.",
955+
"description": "Customization affecting the generation of a NodePort Service for the Administration Server used to expose specific channels or network access points outside the Kubernetes cluster. See also `domains.spec.adminServer.serverService` for configuration affecting the generation of the ClusterIP Service.",
956956
"$ref": "#/definitions/AdminService"
957957
},
958958
"restartVersion": {
@@ -972,14 +972,14 @@
972972
}
973973
},
974974
"annotations": {
975-
"description": "Annotations to associate with the Administration Server\u0027s Service(s).",
975+
"description": "Annotations to associate with the Administration Server\u0027s NodePort Service, if it is created.",
976976
"additionalProperties": {
977977
"type": "string"
978978
},
979979
"$ref": "#/definitions/Map"
980980
},
981981
"labels": {
982-
"description": "Labels to associate with the Administration Server\u0027s Service(s).",
982+
"description": "Labels to associate with the Administration Server\u0027s NodePort Service, if it is created.",
983983
"additionalProperties": {
984984
"type": "string"
985985
},
@@ -1015,7 +1015,7 @@
10151015
]
10161016
},
10171017
"serverService": {
1018-
"description": "Customization affecting the generation of Kubernetes Services for WebLogic Server instances.",
1018+
"description": "Customization affecting the generation of ClusterIP Services for WebLogic Server instances.",
10191019
"$ref": "#/definitions/ServerService"
10201020
},
10211021
"maxUnavailable": {
@@ -1042,7 +1042,7 @@
10421042
},
10431043
"clusterService": {
10441044
"description": "Customization affecting Kubernetes Service generated for this WebLogic cluster.",
1045-
"$ref": "#/definitions/KubernetesResource"
1045+
"$ref": "#/definitions/ClusterService"
10461046
},
10471047
"maxConcurrentShutdown": {
10481048
"description": "The maximum number of WebLogic Server instances that will shut down in parallel for this cluster when it is being partially shut down by lowering its replica count. A value of 0 means there is no limit. Defaults to `spec.maxClusterConcurrentShutdown`, which defaults to 1.",
@@ -1071,6 +1071,33 @@
10711071
"clusterName"
10721072
]
10731073
},
1074+
"ClusterService": {
1075+
"type": "object",
1076+
"properties": {
1077+
"sessionAffinity": {
1078+
"description": "Supports \"ClientIP\" and \"None\". Used to maintain session affinity. Enable client IP based session affinity. Must be ClientIP or None. Defaults to None. More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies",
1079+
"type": "string",
1080+
"enum": [
1081+
"ClientIP",
1082+
"None"
1083+
]
1084+
},
1085+
"annotations": {
1086+
"description": "The annotations to be added to generated resources.",
1087+
"additionalProperties": {
1088+
"type": "string"
1089+
},
1090+
"$ref": "#/definitions/Map"
1091+
},
1092+
"labels": {
1093+
"description": "The labels to be added to generated resources. The label names must not start with \"weblogic.\".",
1094+
"additionalProperties": {
1095+
"type": "string"
1096+
},
1097+
"$ref": "#/definitions/Map"
1098+
}
1099+
}
1100+
},
10741101
"ClusterStatus": {
10751102
"type": "object",
10761103
"properties": {
@@ -1189,7 +1216,7 @@
11891216
"type": "object",
11901217
"properties": {
11911218
"monitoringExporter": {
1192-
"description": "Configuration for the use of the WebLogic Monitoring Exporter as part of this domain.",
1219+
"description": "Automatic deployment and configuration of the WebLogic Monitoring Exporter. If specified, the operator will deploy a sidecar container alongside each WebLogic Server instance that runs the exporter. WebLogic Server instances that are already running when the `monitoringExporter` field is created or deleted, will not be affected until they are restarted. When any given server is restarted for another reason, such as a change to the `restartVersion`, then the newly created pod will have the exporter sidecar or not, as appropriate. See https://github.com/oracle/weblogic-monitoring-exporter.",
11931220
"$ref": "#/definitions/MonitoringExporterSpecification"
11941221
},
11951222
"configuration": {
@@ -1217,7 +1244,7 @@
12171244
"type": "string"
12181245
},
12191246
"serverService": {
1220-
"description": "Customization affecting the generation of Kubernetes Services for WebLogic Server instances.",
1247+
"description": "Customization affecting the generation of ClusterIP Services for WebLogic Server instances.",
12211248
"$ref": "#/definitions/ServerService"
12221249
},
12231250
"domainHome": {
@@ -1246,7 +1273,7 @@
12461273
"$ref": "#/definitions/AdminServer"
12471274
},
12481275
"logHome": {
1249-
"description": "The directory in a server\u0027s container in which to store the domain, Node Manager, server logs, server *.out, introspector .out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Ignored if `logHomeEnabled` is false.",
1276+
"description": "The directory in a server\u0027s container in which to store the domain, Node Manager, server logs, server *.out, introspector .out, and optionally HTTP access log files if `httpAccessLogInLogHome` is true. Default is `/shared/logs/DOMAIN-UID`. Ignored if `logHomeEnabled` is false.",
12501277
"type": "string"
12511278
},
12521279
"includeServerOutInPodLog": {
@@ -1414,25 +1441,6 @@
14141441
}
14151442
}
14161443
},
1417-
"KubernetesResource": {
1418-
"type": "object",
1419-
"properties": {
1420-
"annotations": {
1421-
"description": "The annotations to be added to generated resources.",
1422-
"additionalProperties": {
1423-
"type": "string"
1424-
},
1425-
"$ref": "#/definitions/Map"
1426-
},
1427-
"labels": {
1428-
"description": "The labels to be added to generated resources. The label names must not start with \"weblogic.\".",
1429-
"additionalProperties": {
1430-
"type": "string"
1431-
},
1432-
"$ref": "#/definitions/Map"
1433-
}
1434-
}
1435-
},
14361444
"ManagedServer": {
14371445
"type": "object",
14381446
"properties": {
@@ -1445,7 +1453,7 @@
14451453
]
14461454
},
14471455
"serverService": {
1448-
"description": "Customization affecting the generation of Kubernetes Services for WebLogic Server instances.",
1456+
"description": "Customization affecting the generation of ClusterIP Services for WebLogic Server instances.",
14491457
"$ref": "#/definitions/ServerService"
14501458
},
14511459
"serverName": {
@@ -1504,18 +1512,22 @@
15041512
"modelHome": {
15051513
"description": "Location of the WebLogic Deploy Tooling model home. Defaults to /u01/wdt/models.",
15061514
"type": "string"
1515+
},
1516+
"wdtInstallHome": {
1517+
"description": "Location of the WebLogic Deploy Tooling installation. Defaults to /u01/wdt/weblogic-deploy.",
1518+
"type": "string"
15071519
}
15081520
}
15091521
},
15101522
"MonitoringExporterSpecification": {
15111523
"type": "object",
15121524
"properties": {
15131525
"image": {
1514-
"description": "The WebLogic Monitoring Exporter sidecar image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0",
1526+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.2",
15151527
"type": "string"
15161528
},
15171529
"imagePullPolicy": {
1518-
"description": "The image pull policy for the WebLogic Monitoring Exporter sidecar image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise.",
1530+
"description": "The image pull policy for the WebLogic Monitoring Exporter sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise.",
15191531
"type": "string",
15201532
"enum": [
15211533
"Always",
@@ -1525,7 +1537,7 @@
15251537
},
15261538
"configuration": {
15271539
"x-kubernetes-preserve-unknown-fields": "true",
1528-
"description": "The configuration for the WebLogic Monitoring Exporter sidecar. If specified, the operator will deploy a sidecar alongside each server instance. See https://github.com/oracle/weblogic-monitoring-exporter",
1540+
"description": "The configuration for the WebLogic Monitoring Exporter. If WebLogic Server instances are already running and have the monitoring exporter sidecar container, then changes to this field will be propagated to the exporter without requiring the restart of the WebLogic Server instances.",
15291541
"$ref": "#/definitions/Map"
15301542
}
15311543
}
@@ -1731,7 +1743,7 @@
17311743
"type": "object",
17321744
"properties": {
17331745
"precreateService": {
1734-
"description": "If true, the operator will create Services even for Managed Server instances without running Pods.",
1746+
"description": "If true, the operator will create ClusterIP Services even for WebLogic Server instances without running Pods.",
17351747
"type": "boolean"
17361748
},
17371749
"annotations": {

‎swagger-generator/src/main/java/oracle/kubernetes/operator/SwaggerBuildHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public class SwaggerBuildHelper {
3131
public static void main(String[] args) {
3232

3333
try {
34-
doBuild("swagger/src/main/resources/operator-swagger.json", "documentation/swagger/index.html");
34+
doBuild("swagger-generator/src/main/resources/operator-swagger.json", "documentation/swagger/index.html");
3535
doDomain(
36-
"swagger/src/main/resources/domain-swagger.json",
36+
"swagger-generator/src/main/resources/domain-swagger.json",
3737
"documentation/domains/Domain.json",
3838
"documentation/domains/index.html");
3939
} catch (Throwable e) {

0 commit comments

Comments
 (0)