Skip to content

Commit acb6872

Browse files
gnsuryangnsuryan
authored
Changes for upgrading wls-on-aks offer to support WLS 14.1.2 (#351)
* changes to upgrade wls-on-aks to support 14.1.2 * changes done for local testing * Revert "changes done for local testing" This reverts commit 0cde0df. * update wls-on-aks-azure-marketplace version for 14.1.2 upgrade
1 parent 1b85332 commit acb6872

13 files changed

+68
-30
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<properties>
4141
<!-- versions start -->
4242
<!-- weblogic azure aks versions -->
43-
<version.wls-on-aks-azure-marketplace>1.0.89</version.wls-on-aks-azure-marketplace>
43+
<version.wls-on-aks-azure-marketplace>1.0.90</version.wls-on-aks-azure-marketplace>
4444
<!-- weblogic azure vm versions -->
4545
<version.arm-oraclelinux-wls>1.0.31</version.arm-oraclelinux-wls>
4646
<version.arm-oraclelinux-wls-admin>1.0.56</version.arm-oraclelinux-wls-admin>

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,19 +556,39 @@
556556
"name": "oracleImageSelector",
557557
"type": "Microsoft.Common.DropDown",
558558
"label": "Select desired combination of WebLogic Server, JDK and Operating System or fully qualified Docker tag",
559-
"defaultValue": "14.1.1.0-11",
559+
"defaultValue": "14.1.2.0-17-ol9",
560560
"multiLine": true,
561561
"toolTip": "Select image",
562562
"constraints": {
563563
"allowedValues": [
564+
{
565+
"label": "14.1.2.0-17-ol9",
566+
"description": "14c (14.1.2.0) on JDK 17 on Oracle Linux 9",
567+
"value": "14.1.2.0-generic-jdk17-ol9"
568+
},
569+
{
570+
"label": "14.1.2.0-21-ol9",
571+
"description": "14c (14.1.2.0) on JDK 21 on Oracle Linux 9",
572+
"value": "14.1.2.0-generic-jdk21-ol9"
573+
},
574+
{
575+
"label": "14.1.2.0-17-ol8",
576+
"description": "14c (14.1.2.0) on JDK 17 on Oracle Linux 8",
577+
"value": "14.1.2.0-generic-jdk17-ol8"
578+
},
579+
{
580+
"label": "14.1.2.0-21-ol8",
581+
"description": "14c (14.1.2.0) on JDK 21 on Oracle Linux 8",
582+
"value": "14.1.2.0-generic-jdk21-ol8"
583+
},
564584
{
565585
"label": "14.1.1.0-8",
566-
"description": "14c on JDK 8 on Oracle Linux 7",
586+
"description": "14c (14.1.1.0) on JDK 8 on Oracle Linux 7",
567587
"value": "14.1.1.0-8"
568588
},
569589
{
570590
"label": "14.1.1.0-11",
571-
"description": "14c on JDK 11 on Oracle Linux 7",
591+
"description": "14c (14.1.1.0) on JDK 11 on Oracle Linux 7",
572592
"value": "14.1.1.0-11"
573593
},
574594
{
@@ -578,12 +598,12 @@
578598
},
579599
{
580600
"label": "14.1.1.0-8-ol8",
581-
"description": "14c on JDK 8 on Oracle Linux 8",
601+
"description": "14c (14.1.1.0.0) on JDK 8 on Oracle Linux 8",
582602
"value": "14.1.1.0-8-ol8"
583603
},
584604
{
585605
"label": "14.1.1.0-11-ol8",
586-
"description": "14c on JDK 11 on Oracle Linux 8",
606+
"description": "14c (14.1.1.0.0) on JDK 11 on Oracle Linux 8",
587607
"value": "14.1.1.0-11-ol8"
588608
},
589609
{

‎weblogic-azure-aks/src/main/arm/scripts/common.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export externalJDBCLibrariesDirectoryName="externalJDBCLibraries"
3434
export constFalse="false"
3535
export constTrue="true"
3636
export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos
37-
export constPostgreDriverName="postgresql-42.5.1.jar"
38-
export constMSSQLDriverName="mssql-jdbc-10.2.1.jre8.jar"
37+
export constPostgreDriverName="postgresql-42.7.5.jar"
38+
export constMSSQLDriverName="mssql-jdbc-11.2.3.jre17.jar"
3939
export constAzureCoreVersion="1.34.0"
4040
export constDbPodIdentitySelector="db-pod-identity" # do not change the value
4141
export constPreclassDirectoryName="preclassLibraries"
@@ -64,6 +64,6 @@ export retryMaxAttempt=5 # retry attempt for curl command
6464
export retryInterval=10
6565

6666
export wlsContainerName="weblogic-server"
67-
export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.5.1.jar"
68-
export wlsMSSQLDriverUrl="https://repo.maven.apache.org/maven2/com/microsoft/sqlserver/mssql-jdbc/10.2.1.jre8/mssql-jdbc-10.2.1.jre8.jar"
67+
export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.7.5.jar"
68+
export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/11.2.3.jre17/mssql-jdbc-11.2.3.jre17.jar"
6969
export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz"

‎weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ function validate_admin_console_url() {
393393
jq '.spec.ports[] | select(.name=="internal-t3") | .port')
394394
local adminConsoleUrl="http://${svcAdminServer}.${wlsDomainNS}:${adminTargetPort}/console/"
395395

396-
kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
396+
kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
397397
-- bash -c 'curl --write-out "%{http_code}\n" --silent --output /dev/null "'${adminConsoleUrl}'" | grep "302"'
398398

399399
if [ $? == 1 ]; then

‎weblogic-azure-aks/src/main/arm/scripts/genImageModel.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ cat <<EOF >>${filePath}
135135
SecurityConfiguration:
136136
NodeManagerUsername: "@@SECRET:__weblogic-credentials__:username@@"
137137
NodeManagerPasswordEncrypted: "@@SECRET:__weblogic-credentials__:password@@"
138-
138+
SecureMode:
139+
SecureModeEnabled: false
140+
139141
resources:
140142
SelfTuning:
141143
MinThreadsConstraint:
@@ -198,4 +200,4 @@ EOF
198200
done
199201

200202
# print model
201-
cat ${filePath}
203+
cat ${filePath}

‎weblogic-azure-aks/src/main/arm/scripts/inline-scripts/queryDomainConfigurations.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353

5454
echo "Query WebLogic version and patch numbers"
5555
targetFile4Versions=/tmp/version.info
56-
kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
56+
kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
5757
-- bash -c 'source $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh > /dev/null 2>&1 && java weblogic.version -verbose >"'${targetFile4Versions}'"'
5858
if [ $? != 0 ]; then
5959
echo >&2 "Fail to run java weblogic.version."

‎weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ EOF
252252
echo "copy test script ${testDatasourceScript} to pod path /tmp/${dsScriptFileName}"
253253
targetDSFilePath=/tmp/${dsScriptFileName}
254254
kubectl cp ${testDatasourceScript} -n ${wlsDomainNS} ${podName}:${targetDSFilePath}
255-
kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running"
255+
kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running"
256256

257257
if [ $? == 1 ];then
258258
echo_stderr "Failed to configure datasource ${JDBC_DATASOURCE_NAME}. Please make sure the input values are correct."

‎weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ function parsing_ssl_certs_and_create_ssl_secret() {
663663
--from-literal=ssltruststorepassword=${WLS_SSL_TRUST_PASSWORD}
664664

665665
kubectl -n ${wlsDomainNS} label secret ${kubectlWLSSSLCredentialsName} weblogic.domainUID=${WLS_DOMAIN_UID}
666-
javaOptions=" -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.SSL.trustedCAKeyStore=${sharedPath}/${wlsTrustKeyStoreJKSFileName} ${javaOptions}"
666+
javaOptions=" -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.SSL.trustedCAKeyStore=${sharedPath}/${wlsTrustKeyStoreJKSFileName} -Dweblogic.security.SSL.trustedCAKeyStorePassPhrase=${WLS_SSL_TRUST_PASSWORD} ${javaOptions}"
667667
fi
668668
}
669669

‎weblogic-azure-aks/src/main/arm/scripts/utility.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ function utility_validate_application_status() {
228228
local targetFilePath=/tmp/checkApplicationStatus.py
229229
echo "copy ${pyScriptPath} to ${targetFilePath}"
230230
kubectl cp ${pyScriptPath} -n ${wlsDomainNS} ${podName}:${targetFilePath}
231-
kubectl exec -it ${podName} -n ${wlsDomainNS} -c "weblogic-server" \
231+
kubectl exec ${podName} -n ${wlsDomainNS} -c "weblogic-server" \
232232
-- bash -c "wlst.sh ${targetFilePath} -user ${wlsUser} -password ${wlsPassword} -t3ChannelAddress ${t3ChannelAddress} -t3ChannelPort ${adminTargetPort}" |
233233
grep "Summary: all applications are active"
234234

@@ -349,7 +349,7 @@ function utility_wait_for_pod_restarted() {
349349
while [ ${updatedPodNum} -le ${appReplicas} ] && [ $attempt -le ${checkPodStatusMaxAttemps} ]; do
350350
echo "attempts ${attempt}"
351351
ret=$(kubectl get pods -n ${wlsDomainNS} -l weblogic.domainUID=${wlsDomainUID} -o json |
352-
jq '.items[] | .metadata.creationTimestamp' | tr -d "\"")
352+
jq '.items[] | select(all(.status.containerStatuses[]; .ready == true)) | .metadata.creationTimestamp' | tr -d "\"")
353353

354354
counter=0
355355
for item in $ret; do

‎weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ install_kubectl
2727

2828
connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME
2929

30-
validate_app
30+
validate_app

0 commit comments

Comments
 (0)