Skip to content

Commit ea177cb

Browse files
authored
Oracle SOA Suite Kubernetes script updates for release 24.4.2 (#234)
1 parent 2809754 commit ea177cb

File tree

22 files changed

+228
-89
lines changed

22 files changed

+228
-89
lines changed

OracleSOASuite/kubernetes/charts/apache-samples/custom-sample/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ The second domain uses the following custom configuration parameters:
2424
- domainUID: `domain2`
2525
- clusterName: `cluster-1`
2626
- adminServerName: `admin-server`
27-
- adminPort: `7011`
27+
- adminPort: `7001`
2828
- adminNodePort: `30702`
29-
- managedServerPort: `8021`
29+
- managedServerPort: `7003`
3030

3131
After the domains are successfully created, deploy the sample web application, `testwebapp.war`, on each domain cluster using the WLS Administration Console. The sample web application is located in the `kubernetes/samples/charts/application` directory.
3232

OracleSOASuite/kubernetes/charts/ingress-per-domain/README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ wlsDomain:
7575
domainUID: soainfra
7676
secureEnabled: false
7777
adminServerName: AdminServer
78-
adminServerPort: 7011
79-
adminServerSSLPort: 7012
78+
adminServerPort: 7001
79+
adminServerSSLPort: 7002
8080
adminSecurePort: 9002
8181
soaClusterName: soa_cluster
82-
soaManagedServerPort: 8011
83-
soaManagedServerSSLPort: 8012
82+
soaManagedServerPort: 7003
83+
soaManagedServerSSLPort: 7004
8484
osbClusterName: osb_cluster
85-
osbManagedServerPort: 9011
86-
osbManagedServerSSLPort: 9012
85+
osbManagedServerPort: 8002
86+
osbManagedServerSSLPort: 8003
8787
8888
# Host Specific Values
8989
hostName:
90-
admin: admin.org
91-
soa: soa.org
92-
osb: osb.org
90+
admin: admin.domain.org
91+
soa: soa.domain.org
92+
osb: osb.domain.org
9393
9494
```
9595
## Uninstalling the chart
@@ -106,18 +106,18 @@ The following table lists the configurable parameters of this chart and their de
106106
| `sslType` | Type of Configuration. values are `NONSSL` , `SSL` and `E2ESSL`. | `NONSSL` |
107107
| `secureEnabled` | Secure Administration enabled in SOA domain | `false` |
108108
| `domainType` | Type of SOA Domain. values are `soa` or `osb` or`soaosb`. | `soa` |
109-
| `hostName.admin` | Admin host name. | `admin.org` |
110-
| `hostName.soa` | Soa host name. | `soa.org` |
111-
| `hostName.osb` | Osb host name. | `osb.org` |
109+
| `hostName.admin` | Admin host name. | `admin.domain.org` |
110+
| `hostName.soa` | Soa host name. | `soa.domain.org` |
111+
| `hostName.osb` | Osb host name. | `osb.domain.org` |
112112
| `wlsDomain.domainUID` | DomainUID of the Soa domain. | `soainfra` |
113113
| `wlsDomain.soaClusterName` | Cluster name in the SOA domain. | `soa_cluster` |
114114
| `wlsDomain.osbClusterName` | Cluster name in the OSB domain. | `osb_cluster` |
115115
| `wlsDomain.adminServerPort` | Port number of the Admin servers in the Soa domain cluster . | `7001` |
116116
| `wlsDomain.adminServerSSLPort` | Port number of the Admin servers in the Soa domain cluster . | `7002` |
117117
| `wlsDomain.adminSecurePort` | Port number of the Secure Administration servers in the Soa domain cluster and not configurable. | `9002` |
118-
| `wlsDomain.soaManagedServerPort` | Port number of the managed servers in the Soa domain cluster. | `8001` |
119-
| `wlsDomain.soaManagedServerSSLPort` | SSL Port number of the managed servers in the Soa domain cluster. | `8002` |
120-
| `wlsDomain.osbManagedServerPort` | Port number of the managed servers in the Soa domain cluster. | `9001` |
121-
| `wlsDomain.osbManagedServerSSLPort` | Port number of the managed servers in the Soa domain cluster. | `9002` |
118+
| `wlsDomain.soaManagedServerPort` | Port number of the managed servers in the Soa domain cluster. | `7003` |
119+
| `wlsDomain.soaManagedServerSSLPort` | SSL Port number of the managed servers in the Soa domain cluster. | `7004` |
120+
| `wlsDomain.osbManagedServerPort` | Port number of the managed servers in the Soa domain cluster. | `8002` |
121+
| `wlsDomain.osbManagedServerSSLPort` | Port number of the managed servers in the Soa domain cluster. | `8003` |
122122

123123
>**NOTE:** The input values `domainUID` and `clusterName` will be used to generate the Kubernetes `serviceName` of the WLS cluster with the format `domainUID-cluster-clusterName`.

OracleSOASuite/kubernetes/charts/ingress-per-domain/templates/nginx-ingress-nonssl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
{{- if eq .Values.type "NGINX" }}

OracleSOASuite/kubernetes/charts/ingress-per-domain/templates/nginx-ingress-ssl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
{{- if eq .Values.type "NGINX" }}

OracleSOASuite/kubernetes/charts/ingress-per-domain/values.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
#
@@ -22,14 +22,14 @@ wlsDomain:
2222
secureEnabled: false
2323
adminServerName: AdminServer
2424
adminSecurePort: 9002
25-
adminServerPort: 7011
26-
adminServerSSLPort: 7012
25+
adminServerPort: 7001
26+
adminServerSSLPort: 7002
2727
soaClusterName: soa_cluster
28-
soaManagedServerPort: 8011
29-
soaManagedServerSSLPort: 8012
28+
soaManagedServerPort: 7003
29+
soaManagedServerSSLPort: 7004
3030
osbClusterName: osb_cluster
31-
osbManagedServerPort: 9011
32-
osbManagedServerSSLPort: 9012
31+
osbManagedServerPort: 8002
32+
osbManagedServerSSLPort: 8003
3333

3434
# Host specific values
3535
hostName:

OracleSOASuite/kubernetes/charts/traefik/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
image:
5-
name: traefik
65
pullPolicy: IfNotPresent
76
ingressRoute:
87
dashboard:

OracleSOASuite/kubernetes/create-soa-domain/domain-home-on-pv/common/createSOADomain.py

Lines changed: 51 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
class SOAProvisioner:
1010

1111
jrfDone = 0;
12+
secureDomain = 'false';
13+
domainVersion = '';
1214
MACHINES = {
1315
'machine1' : {
1416
'NMType': 'SSL',
@@ -60,16 +62,14 @@ class SOAProvisioner:
6062
'serverGroupsToTarget' : [ 'OSB-MGD-SVRS-COMBINED' ]
6163
}
6264

63-
FLAG_1412 = 'false'
64-
6565
def __init__(self, oracleHome, javaHome, domainParentDir):
6666
self.oracleHome = self.validateDirectory(oracleHome)
6767
self.javaHome = self.validateDirectory(javaHome)
6868
self.domainParentDir = self.validateDirectory(domainParentDir, create=True)
6969
return
7070

71-
def createSOADomain(self, domainName, user, password, db, dbPrefix, dbPassword, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase, soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode, secureMode, managedCount, soaClusterName, osbClusterName, sslEnabled, domainType, exposeAdminT3Channel=None, t3ChannelPublicAddress=None, t3ChannelPort=None):
72-
domainHome = self.createBaseDomain(domainName, user, password, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase, soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode, secureMode, managedCount, sslEnabled, soaClusterName, osbClusterName, domainType)
71+
def createSOADomain(self, domainName, user, password, db, dbPrefix, dbPassword, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase, soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode, secureMode, managedCount, soaClusterName, osbClusterName, sslEnabled, domainType, adminAdministrationPort, soaAdministrationPort, osbAdministrationPort, exposeAdminT3Channel=None, t3ChannelPublicAddress=None, t3ChannelPort=None):
72+
domainHome = self.createBaseDomain(domainName, user, password, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase, soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode, secureMode, managedCount, sslEnabled, soaClusterName, osbClusterName, domainType, adminAdministrationPort, soaAdministrationPort, osbAdministrationPort)
7373

7474

7575
if domainType == "soa" or domainType == "soaosb":
@@ -89,15 +89,29 @@ def createSOADomain(self, domainName, user, password, db, dbPrefix, dbPassword,
8989
else:
9090
print 'persistentStore = '+persistentStore+'...skipping JDBC reconfig'
9191

92-
# Fix for bug 36654711 until changes comes with WSM template
92+
readDomain(domainHome)
93+
# Update the default port values for default servers for 14.1.2.0.0
94+
if ( self.domainVersion == "14.1.2.0.0" and self.secureDomain == 'false' ):
95+
if ("soa" in domainType and 'soa_server1' in self.SOA_MANAGED_SERVERS ):
96+
self.updateDefaultServerParameters(domainHome, sslEnabled, "soa_server1")
97+
if "osb" in domainType and 'osb_server1' in self.OSB_MANAGED_SERVERS:
98+
self.updateDefaultServerParameters(domainHome, sslEnabled, "osb_server1")
99+
100+
# Fix for bug 36654711
93101
self.updateAppTarget(domainHome,"wsm-pm",adminName)
102+
updateDomain()
103+
94104

105+
def updateDefaultServerParameters(self, domainHome, sslEnabled, serverName):
106+
print 'Removing administrationPort and SSL entries for default server ' + serverName
107+
cd('/Servers/'+ serverName)
108+
set('administrationPort', 0)
109+
if (sslEnabled == 'false'):
110+
delete(serverName, 'SSL')
95111

96112
def updateAppTarget(self, domainHome, appName, targetName):
97113
print 'Adding target: '+ targetName+' for '+appName
98-
readDomain(domainHome)
99114
assign("AppDeployment", appName, "Target", targetName)
100-
updateDomain()
101115

102116

103117
def configureTlogJDBCStore(self, domainHome, domainType):
@@ -431,7 +445,7 @@ def getDSMBean(self, jdbcDS):
431445
return
432446

433447

434-
def createManagedServers(self, ms_count, managedNameBase, ms_port, cluster_name, ms_servers, managedServerSSLPort, sslEnabled):
448+
def createManagedServers(self, ms_count, managedNameBase, ms_port, cluster_name, ms_servers, managedServerSSLPort, sslEnabled, ms_admin_port):
435449
# Create managed servers
436450
for index in range(0, ms_count):
437451
cd('/')
@@ -441,9 +455,9 @@ def createManagedServers(self, ms_count, managedNameBase, ms_port, cluster_name,
441455
create(name, 'Server')
442456
cd('/Servers/%s/' % name )
443457
print('Creating managed server: %s' % name);
458+
if ( self.secureDomain == 'true'):
459+
set('administrationPort', ms_admin_port)
444460
set('ListenPort', ms_port)
445-
if (self.FLAG_1412 == 'true'):
446-
set('ListenPortEnabled', true)
447461
set('NumOfRetriesBeforeMSIMode', 0)
448462
set('RetryIntervalBeforeMSIMode', 1)
449463
set('Cluster', cluster_name)
@@ -458,19 +472,17 @@ def createManagedServers(self, ms_count, managedNameBase, ms_port, cluster_name,
458472
print ms_servers
459473
return ms_servers
460474

461-
def createBaseDomain(self, domainName, user, password, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase,soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode, secureMode, managedCount, sslEnabled, soaClusterName, osbClusterName, domainType):
475+
def createBaseDomain(self, domainName, user, password, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase,soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode, secureMode, managedCount, sslEnabled, soaClusterName, osbClusterName, domainType, adminAdministrationPort, soaAdministrationPort, osbAdministrationPort):
462476
baseTemplate = self.replaceTokens(self.JRF_TEMPLATES['baseTemplate'])
463477

464478
readTemplate(baseTemplate)
465479
setOption('DomainName', domainName)
466480
setOption('JavaHome', self.javaHome)
467-
domainVersion = cmo.getDomainVersion()
481+
self.domainVersion = cmo.getDomainVersion()
468482
if prodMode == 'true':
469-
if (domainVersion == "14.1.2.0.0" and secureMode == 'true'):
483+
if (self.domainVersion == "14.1.2.0.0" and secureMode == 'true'):
470484
setOption('ServerStartMode', 'secure')
471-
elif (domainVersion == "14.1.2.0.0" and secureMode == 'false'):
472-
setOption('ServerStartMode', 'prod')
473-
self.FLAG_1412 = 'true'
485+
self.secureDomain = 'true'
474486
else:
475487
setOption('ServerStartMode', 'prod')
476488
else:
@@ -486,8 +498,8 @@ def createBaseDomain(self, domainName, user, password, adminListenPort, adminSer
486498
print 'Creating Admin Server...'
487499
cd('/Servers/AdminServer')
488500
set('ListenPort', admin_port)
489-
if ( self.FLAG_1412 == 'true'):
490-
set('ListenPortEnabled', true)
501+
if ( self.secureDomain == 'true'):
502+
set('administrationPort', int(adminAdministrationPort))
491503
set('Name', adminName)
492504
self.ADMIN_SERVER_NAME = adminName
493505
cmo.setWeblogicPluginEnabled(true)
@@ -511,15 +523,15 @@ def createBaseDomain(self, domainName, user, password, adminListenPort, adminSer
511523
print '\nCreating cluster...' + soaClusterName
512524
cd('/')
513525
cl=create(soaClusterName, 'Cluster')
514-
self.SOA_MANAGED_SERVERS = self.createManagedServers(ms_count, soaManagedNameBase, ms_port, soaClusterName, self.SOA_MANAGED_SERVERS, managedSSLPort, sslEnabled)
526+
self.SOA_MANAGED_SERVERS = self.createManagedServers(ms_count, soaManagedNameBase, ms_port, soaClusterName, self.SOA_MANAGED_SERVERS, managedSSLPort, sslEnabled, int(soaAdministrationPort))
515527
print 'Created managed Servers for cluster..... ' + soaClusterName
516528
elif domainType == "osb":
517529
ms_port = int(osbManagedServerPort)
518530
managedSSLPort = int(osbManagedServerSSLPort)
519531
print '\nCreating cluster...' + osbClusterName
520532
cd('/')
521533
cl=create(osbClusterName, 'Cluster')
522-
self.OSB_MANAGED_SERVERS = self.createManagedServers(ms_count, osbManagedNameBase, ms_port, osbClusterName, self.OSB_MANAGED_SERVERS, managedSSLPort, sslEnabled)
534+
self.OSB_MANAGED_SERVERS = self.createManagedServers(ms_count, osbManagedNameBase, ms_port, osbClusterName, self.OSB_MANAGED_SERVERS, managedSSLPort, sslEnabled, int(osbAdministrationPort))
523535
print 'Created managed Servers for cluster..... ' + osbClusterName
524536

525537
# Creating additional cluster and managed servers
@@ -528,7 +540,7 @@ def createBaseDomain(self, domainName, user, password, adminListenPort, adminSer
528540
cd('/')
529541
cl=create(osbClusterName, 'Cluster')
530542
# Creating managed servers for additional cluster
531-
self.OSB_MANAGED_SERVERS = self.createManagedServers(ms_count, osbManagedNameBase, int(osbManagedServerPort), osbClusterName, self.OSB_MANAGED_SERVERS, int(osbManagedServerSSLPort), sslEnabled)
543+
self.OSB_MANAGED_SERVERS = self.createManagedServers(ms_count, osbManagedNameBase, int(osbManagedServerPort), osbClusterName, self.OSB_MANAGED_SERVERS, int(osbManagedServerSSLPort), sslEnabled, int(osbAdministrationPort))
532544
print 'Created managed Servers for additional cluster..... ' + osbClusterName
533545

534546
# Create Node Manager
@@ -830,7 +842,7 @@ def enable_admin_channel(self, admin_channel_address, admin_channel_port):
830842
# Entry point to the script #
831843
#############################
832844

833-
def usage():
845+
def usage(status=0):
834846
print sys.argv[0] + ' -oh <oracle_home> -jh <java_home> -parent <domain_parent_dir> -name <domain-name> ' + \
835847
'-user <domain-user> -password <domain-password> ' + \
836848
'-rcuDb <rcu-database> -rcuPrefix <rcu-prefix> -rcuSchemaPwd <rcu-schema-password> ' \
@@ -840,18 +852,19 @@ def usage():
840852
'-soaManagedServerSSLPort <soaManagedServerSSLPort> -osbManagedServerSSLPort <osbManagedServerSSLPort> ' \
841853
'-prodMode <prodMode> -managedServerCount <managedCount> -secureMode <secureMode> ' \
842854
'-soaClusterName <soaClusterName> -osbClusterName <osbClusterName> ' \
855+
'-adminAdministrationPort <adminAdministrationPort> -soaAdministrationPort <soaAdministrationPort> -osbAdministrationPort <osbAdministrationPort> ' \
843856
'-domainType <soa|osb|soaosb|soab2b|soaosbb2b> ' \
844857
'-exposeAdminT3Channel <quoted true or false> -t3ChannelPublicAddress <address of the cluster> ' \
845858
'-t3ChannelPort <t3 channel port> -persistentStore <jdbc|file>'
846-
sys.exit(0)
859+
sys.exit(status)
847860

848861
# Uncomment for Debug only
849862
#print str(sys.argv[0]) + " called with the following sys.argv array:"
850863
#for index, arg in enumerate(sys.argv):
851864
# print "sys.argv[" + str(index) + "] = " + str(sys.argv[index])
852865

853866
if len(sys.argv) < 17:
854-
usage()
867+
usage(1)
855868

856869
#oracleHome will be passed by command line parameter -oh.
857870
oracleHome = None
@@ -873,6 +886,9 @@ def usage():
873886
t3ChannelPort = None
874887
t3ChannelPublicAddress = None
875888
persistentStore = 'jdbc'
889+
adminAdministrationPort = '9002'
890+
soaAdministrationPort = '9004'
891+
osbAdministrationPort = '9007'
876892

877893
i = 1
878894
while i < len(sys.argv):
@@ -963,10 +979,19 @@ def usage():
963979
elif sys.argv[i] == '-persistentStore':
964980
persistentStore = sys.argv[i + 1]
965981
i += 2
982+
elif sys.argv[i] == '-adminAdministrationPort':
983+
adminAdministrationPort = sys.argv[i + 1]
984+
i += 2
985+
elif sys.argv[i] == '-soaAdministrationPort':
986+
soaAdministrationPort = sys.argv[i + 1]
987+
i += 2
988+
elif sys.argv[i] == '-osbAdministrationPort':
989+
osbAdministrationPort = sys.argv[i + 1]
990+
i += 2
966991
else:
967992
print 'Unexpected argument switch at position ' + str(i) + ': ' + str(sys.argv[i])
968-
usage()
993+
usage(1)
969994
sys.exit(1)
970995

971996
provisioner = SOAProvisioner(oracleHome, javaHome, domainParentDir)
972-
provisioner.createSOADomain(domainName, domainUser, domainPassword, rcuDb, rcuSchemaPrefix, rcuSchemaPassword, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase, soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode,secureMode, managedCount, soaClusterName, osbClusterName, sslEnabled, domainType, exposeAdminT3Channel, t3ChannelPublicAddress, t3ChannelPort)
997+
provisioner.createSOADomain(domainName, domainUser, domainPassword, rcuDb, rcuSchemaPrefix, rcuSchemaPassword, adminListenPort, adminServerSSLPort, adminName, soaManagedNameBase, osbManagedNameBase, soaManagedServerPort, osbManagedServerPort, soaManagedServerSSLPort, osbManagedServerSSLPort, prodMode,secureMode, managedCount, soaClusterName, osbClusterName, sslEnabled, domainType, adminAdministrationPort, soaAdministrationPort, osbAdministrationPort, exposeAdminT3Channel, t3ChannelPublicAddress, t3ChannelPort)

0 commit comments

Comments
 (0)