Merge pull request #22 from galiacheng/t3tunneling

WLS on AKS: Support T3 tunneling

Author: mriccell

weblogic-azure-aks/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>com.oracle.weblogic.azure</groupId>
   <artifactId>wls-on-aks-azure-marketplace</artifactId>
-  <version>1.0.16</version>
+  <version>1.0.17</version>
 
   <parent>
     <groupId>com.microsoft.azure.iaas</groupId>

weblogic-azure-aks/src/main/arm/createUiDefinition.json

@@ -15,7 +15,7 @@ function read_sensitive_parameters_from_stdin() {
 
 #Function to display usage message
 function usage() {
-    echo "<azureACRPassword> <ocrSSOPSW> ./buildWLSDockerImage.sh ./buildWLSDockerImage.sh <wlsImagePath> <azureACRServer> <azureACRUserName> <imageTag> <appPackageUrls> <ocrSSOUser> <wlsClusterSize> <enableSSL>"
+    echo "<azureACRPassword> <ocrSSOPSW> ./buildWLSDockerImage.sh ./buildWLSDockerImage.sh <wlsImagePath> <azureACRServer> <azureACRUserName> <imageTag> <appPackageUrls> <ocrSSOUser> <wlsClusterSize> <enableSSL> <enableAdminT3Tunneling> <enableClusterT3Tunneling>"
     if [ $1 -eq 1 ]; then
         exit 1
     fi
@@ -80,6 +80,16 @@ function validate_inputs() {
         echo_stderr "enableSSL is required. "
         usage 1
     fi
+
+    if [ -z "$enableAdminT3Tunneling" ]; then
+        echo_stderr "enableAdminT3Tunneling is required. "
+        usage 1
+    fi
+
+    if [ -z "$enableClusterT3Tunneling" ]; then
+        echo_stderr "enableClusterT3Tunneling is required. "
+        usage 1
+    fi
 }
 
 function initialize() {
@@ -179,7 +189,9 @@ EOF
     bash $scriptDir/genImageModel.sh \
         ${modelFilePath} \
         ${appPackageUrls} \
-        ${enableSSL}
+        ${enableSSL} \
+        ${enableAdminT3Tunneling} \
+        ${enableClusterT3Tunneling}
     validate_status "Generate image model file."
 }
 
@@ -236,11 +248,13 @@ export appPackageUrls=$5
 export ocrSSOUser=$6
 export wlsClusterSize=$7
 export enableSSL=$8
+export enableAdminT3Tunneling=$9
+export enableClusterT3Tunneling=${10}
 
 export acrImagePath="$azureACRServer/aks-wls-images:${imageTag}"
 export ocrLoginServer="container-registry.oracle.com"
-export wdtDownloadURL="https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.14/weblogic-deploy.zip"
-export witDownloadURL="https://github.com/oracle/weblogic-image-tool/releases/download/release-1.9.12/imagetool.zip"
+export wdtDownloadURL="https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.17/weblogic-deploy.zip"
+export witDownloadURL="https://github.com/oracle/weblogic-image-tool/releases/download/release-1.9.16/imagetool.zip"
 export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.2.8.jar"
 export wlsMSSQLDriverUrl="https://repo.maven.apache.org/maven2/com/microsoft/sqlserver/mssql-jdbc/7.4.1.jre8/mssql-jdbc-7.4.1.jre8.jar"
 

weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh

@@ -2,7 +2,13 @@ export checkPodStatusInterval=20 # interval of checking pod status.
 export checkPodStatusMaxAttemps=30 # max attempt to check pod status.
 export checkPVStateInterval=5 # interval of checking pvc status.
 export checkPVStateMaxAttempt=10 # max attempt to check pvc status.
+export checkSVCStateMaxAttempt=10
+export checkSVCInterval=30 #seconds
 
+export constAdminT3AddressEnvName="T3_TUNNELING_ADMIN_ADDRESS"
+export constAdminServerName='admin-server'
+export constClusterName='cluster-1'
+export constClusterT3AddressEnvName="T3_TUNNELING_CLUSTER_ADDRESS"
 export constFalse="false"
 export constTrue="true"