Merge remote-tracking branch 'origin/develop-bug2968457-bug29591809' into release/2.2

Author: rjeberhard

kubernetes/samples/scripts/common/utility.sh

@@ -367,6 +367,7 @@ function createFiles {
     sed -i -e "s:%RCU_CREDENTIALS_SECRET_NAME%:${rcuCredentialsSecret}:g" ${createJobOutput}
     sed -i -e "s:%CUSTOM_RCUPREFIX%:${rcuSchemaPrefix}:g" ${createJobOutput}
     sed -i -e "s|%CUSTOM_CONNECTION_STRING%|${rcuDatabaseURL}|g" ${createJobOutput}
+    sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3Channel}:g" ${createJobOutput}
 
     # Generate the yaml to create the kubernetes job that will delete the weblogic domain_home folder
     echo Generating ${deleteJobOutput}

kubernetes/samples/scripts/create-fmw-infrastructure-domain/common/createFMWDomain.py

@@ -34,9 +34,14 @@ def __init__(self, oracleHome, javaHome, domainParentDir, adminListenPort, admin
         self.domainParentDir = self.validateDirectory(domainParentDir, create=True)
         return
 
-    def createInfraDomain(self, domainName, user, password, db, dbPrefix, dbPassword, adminListenPort, adminName, managedNameBase, managedServerPort, prodMode, managedCount, clusterName):
-        domainHome = self.createBaseDomain(domainName, user, password, adminListenPort, adminName, managedNameBase, managedServerPort, prodMode, managedCount, clusterName)
-        self.extendDomain(domainHome, db, dbPrefix, dbPassword)
+    def createInfraDomain(self, domainName, user, password, db, dbPrefix, dbPassword, adminListenPort, adminName,
+                          managedNameBase, managedServerPort, prodMode, managedCount, clusterName,
+                          exposeAdminT3Channel=None, t3ChannelPublicAddress=None, t3ChannelPort=None):
+        domainHome = self.createBaseDomain(domainName, user, password, adminListenPort, adminName, managedNameBase,
+                                           managedServerPort, prodMode, managedCount, clusterName
+                                           )
+        self.extendDomain(domainHome, db, dbPrefix, dbPassword, exposeAdminT3Channel, t3ChannelPublicAddress,
+                          t3ChannelPort)
 
     def createBaseDomain(self, domainName, user, password, adminListenPort, adminName, managedNameBase, managedServerPort, prodMode, managedCount, clusterName):
         baseTemplate = self.replaceTokens(self.JRF_12213_TEMPLATES['baseTemplate'])
@@ -112,12 +117,17 @@ def createBaseDomain(self, domainName, user, password, adminListenPort, adminNam
         return domainHome
 
 
-    def extendDomain(self, domainHome, db, dbPrefix, dbPassword):
+    def extendDomain(self, domainHome, db, dbPrefix, dbPassword, exposeAdminT3Channel, t3ChannelPublicAddress,
+                     t3ChannelPort):
         print 'Extending domain at ' + domainHome
         print 'Database  ' + db
         readDomain(domainHome)
         setOption('AppDir', self.domainParentDir + '/applications')
 
+        print 'ExposeAdminT3Channel %s with %s:%s ' % (exposeAdminT3Channel, t3ChannelPublicAddress, t3ChannelPort)
+        if 'true' == exposeAdminT3Channel:
+            self.enable_admin_channel(t3ChannelPublicAddress, t3ChannelPort)
+
         print 'Applying JRF templates...'
         for extensionTemplate in self.JRF_12213_TEMPLATES['extensionTemplates']:
             addTemplate(self.replaceTokens(extensionTemplate))
@@ -197,6 +207,18 @@ def replaceTokens(self, path):
             result = path.replace('@@ORACLE_HOME@@', oracleHome)
         return result
 
+    def enable_admin_channel(self, admin_channel_address, admin_channel_port):
+        if admin_channel_address == None or admin_channel_port == 'None':
+            return
+        cd('/')
+        admin_server_name = get('AdminServerName')
+        print('setting admin server t3channel for ' + admin_server_name)
+        cd('/Servers/' + admin_server_name)
+        create('T3Channel', 'NetworkAccessPoint')
+        cd('/Servers/' + admin_server_name + '/NetworkAccessPoint/T3Channel')
+        set('ListenPort', int(admin_channel_port))
+        set('PublicPort', int(admin_channel_port))
+        set('PublicAddress', admin_channel_address)
 
 #############################
 # Entry point to the script #
@@ -208,7 +230,9 @@ def usage():
           '-rcuDb <rcu-database> -rcuPrefix <rcu-prefix> -rcuSchemaPwd <rcu-schema-password> ' \
           '-adminListenPort <adminListenPort> -adminName <adminName> ' \
           '-managedNameBase <managedNameBase> -managedServerPort <managedServerPort> -prodMode <prodMode> ' \
-          '-managedServerCount <managedCount> -clusterName <clusterName>'
+          '-managedServerCount <managedCount> -clusterName <clusterName> ' \
+          '-exposeAdminT3Channel <quoted true or false> -t3ChannelPublicAddress <address of the cluster> ' \
+          '-t3ChannelPort <t3 channel port> '
     sys.exit(0)
 
 # Uncomment for Debug only
@@ -235,7 +259,9 @@ def usage():
 rcuSchemaPrefix = 'DEV12'
 #change rcuSchemaPassword to your infra schema password. Command line parameter -rcuSchemaPwd.
 rcuSchemaPassword = None
-
+exposeAdminT3Channel = None
+t3ChannelPort = None
+t3ChannelPublicAddress = None
 i = 1
 while i < len(sys.argv):
     if sys.argv[i] == '-oh':
@@ -286,10 +312,21 @@ def usage():
     elif sys.argv[i] == '-clusterName':
         clusterName = sys.argv[i + 1]
         i += 2
+    elif sys.argv[i] == '-t3ChannelPublicAddress':
+        t3ChannelPublicAddress = sys.argv[i + 1]
+        i += 2
+    elif sys.argv[i] == '-t3ChannelPort':
+        t3ChannelPort = sys.argv[i + 1]
+        i += 2
+    elif sys.argv[i] == '-exposeAdminT3Channel':
+        exposeAdminT3Channel = sys.argv[i + 1]
+        i += 2
     else:
         print 'Unexpected argument switch at position ' + str(i) + ': ' + str(sys.argv[i])
         usage()
         sys.exit(1)
 
 provisioner = Infra12213Provisioner(oracleHome, javaHome, domainParentDir, adminListenPort, adminName, managedNameBase, managedServerPort, prodMode, managedCount, clusterName)
-provisioner.createInfraDomain(domainName, domainUser, domainPassword, rcuDb, rcuSchemaPrefix, rcuSchemaPassword, adminListenPort, adminName, managedNameBase, managedServerPort, prodMode, managedCount, clusterName)
+provisioner.createInfraDomain(domainName, domainUser, domainPassword, rcuDb, rcuSchemaPrefix, rcuSchemaPassword,
+                              adminListenPort, adminName, managedNameBase, managedServerPort, prodMode, managedCount,
+                              clusterName, exposeAdminT3Channel, t3ChannelPublicAddress, t3ChannelPort)

kubernetes/samples/scripts/create-fmw-infrastructure-domain/create-domain-job-template.yaml

@@ -75,6 +75,8 @@ spec:
               value: "%PRODUCTION_MODE_ENABLED%"
             - name: CUSTOM_CONNECTION_STRING
               value: "%CUSTOM_CONNECTION_STRING%"
+            - name: EXPOSE_T3_CHANNEL_PREFIX
+              value: "%EXPOSE_T3_CHANNEL_PREFIX%"
       volumes:
         - name: create-fmw-infra-sample-domain-job-cm-volume
           configMap:

kubernetes/samples/scripts/create-fmw-infrastructure-domain/create-domain.sh

@@ -128,6 +128,11 @@ function initialize {
   validateCommonInputs
 
   initOutputDir
+  getKubernetesClusterIP
+  if [ -z "${t3PublicAddress}" ]; then
+    t3PublicAddress="${K8S_IP}"
+  fi
+
 }
 
 # create domain configmap using what is in the createDomainFilesDir

kubernetes/samples/scripts/create-fmw-infrastructure-domain/wlst/create-domain-script.sh

@@ -22,5 +22,7 @@ wlst.sh -skipWLSModuleScanning \
         -managedServerPort ${CUSTOM_MANAGEDSERVER_PORT} \
         -prodMode ${CUSTOM_PRODUCTION_MODE} \
         -managedServerCount ${CUSTOM_MANAGED_SERVER_COUNT} \
-        -clusterName ${CUSTOM_CLUSTER_NAME}
-
+        -clusterName ${CUSTOM_CLUSTER_NAME} \
+        -exposeAdminT3Channel ${EXPOSE_T3_CHANNEL_PREFIX} \
+        -t3ChannelPublicAddress ${T3_PUBLIC_ADDRESS} \
+        -t3ChannelPort ${T3_CHANNEL_PORT}