Skip to content

Changes for upgrading wls-on-aks offer to support WLS 14.1.2 #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 5, 2025
Merged

Changes for upgrading wls-on-aks offer to support WLS 14.1.2 #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e37dafb
changes to upgrade wls-on-aks to support 14.1.2
gnsuryan Jun 3, 2025
0cde0df
changes done for local testing
gnsuryan Jun 3, 2025
32b16fc
Revert "changes done for local testing"
gnsuryan Jun 4, 2025
affa112
update wls-on-aks-azure-marketplace version for 14.1.2 upgrade
gnsuryan Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<properties>
<!-- versions start -->
<!-- weblogic azure aks versions -->
<version.wls-on-aks-azure-marketplace>1.0.89</version.wls-on-aks-azure-marketplace>
<version.wls-on-aks-azure-marketplace>1.0.90</version.wls-on-aks-azure-marketplace>
<!-- weblogic azure vm versions -->
<version.arm-oraclelinux-wls>1.0.31</version.arm-oraclelinux-wls>
<version.arm-oraclelinux-wls-admin>1.0.56</version.arm-oraclelinux-wls-admin>
Expand Down
30 changes: 25 additions & 5 deletions weblogic-azure-aks/src/main/arm/createUiDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,19 +556,39 @@
"name": "oracleImageSelector",
"type": "Microsoft.Common.DropDown",
"label": "Select desired combination of WebLogic Server, JDK and Operating System or fully qualified Docker tag",
"defaultValue": "14.1.1.0-11",
"defaultValue": "14.1.2.0-17-ol9",
"multiLine": true,
"toolTip": "Select image",
"constraints": {
"allowedValues": [
{
"label": "14.1.2.0-17-ol9",
"description": "14c (14.1.2.0) on JDK 17 on Oracle Linux 9",
"value": "14.1.2.0-generic-jdk17-ol9"
},
{
"label": "14.1.2.0-21-ol9",
"description": "14c (14.1.2.0) on JDK 21 on Oracle Linux 9",
"value": "14.1.2.0-generic-jdk21-ol9"
},
{
"label": "14.1.2.0-17-ol8",
"description": "14c (14.1.2.0) on JDK 17 on Oracle Linux 8",
"value": "14.1.2.0-generic-jdk17-ol8"
},
{
"label": "14.1.2.0-21-ol8",
"description": "14c (14.1.2.0) on JDK 21 on Oracle Linux 8",
"value": "14.1.2.0-generic-jdk21-ol8"
},
{
"label": "14.1.1.0-8",
"description": "14c on JDK 8 on Oracle Linux 7",
"description": "14c (14.1.1.0) on JDK 8 on Oracle Linux 7",
"value": "14.1.1.0-8"
},
{
"label": "14.1.1.0-11",
"description": "14c on JDK 11 on Oracle Linux 7",
"description": "14c (14.1.1.0) on JDK 11 on Oracle Linux 7",
"value": "14.1.1.0-11"
},
{
Expand All @@ -578,12 +598,12 @@
},
{
"label": "14.1.1.0-8-ol8",
"description": "14c on JDK 8 on Oracle Linux 8",
"description": "14c (14.1.1.0.0) on JDK 8 on Oracle Linux 8",
"value": "14.1.1.0-8-ol8"
},
{
"label": "14.1.1.0-11-ol8",
"description": "14c on JDK 11 on Oracle Linux 8",
"description": "14c (14.1.1.0.0) on JDK 11 on Oracle Linux 8",
"value": "14.1.1.0-11-ol8"
},
{
Expand Down
8 changes: 4 additions & 4 deletions weblogic-azure-aks/src/main/arm/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export externalJDBCLibrariesDirectoryName="externalJDBCLibraries"
export constFalse="false"
export constTrue="true"
export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos
export constPostgreDriverName="postgresql-42.5.1.jar"
export constMSSQLDriverName="mssql-jdbc-10.2.1.jre8.jar"
export constPostgreDriverName="postgresql-42.7.5.jar"
export constMSSQLDriverName="mssql-jdbc-11.2.3.jre17.jar"
export constAzureCoreVersion="1.34.0"
export constDbPodIdentitySelector="db-pod-identity" # do not change the value
export constPreclassDirectoryName="preclassLibraries"
Expand Down Expand Up @@ -64,6 +64,6 @@ export retryMaxAttempt=5 # retry attempt for curl command
export retryInterval=10

export wlsContainerName="weblogic-server"
export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.5.1.jar"
export wlsMSSQLDriverUrl="https://repo.maven.apache.org/maven2/com/microsoft/sqlserver/mssql-jdbc/10.2.1.jre8/mssql-jdbc-10.2.1.jre8.jar"
export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.7.5.jar"
export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/11.2.3.jre17/mssql-jdbc-11.2.3.jre17.jar"
export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz"
2 changes: 1 addition & 1 deletion weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ function validate_admin_console_url() {
jq '.spec.ports[] | select(.name=="internal-t3") | .port')
local adminConsoleUrl="http://${svcAdminServer}.${wlsDomainNS}:${adminTargetPort}/console/"

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

if [ $? == 1 ]; then
Expand Down
6 changes: 4 additions & 2 deletions weblogic-azure-aks/src/main/arm/scripts/genImageModel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ cat <<EOF >>${filePath}
SecurityConfiguration:
NodeManagerUsername: "@@SECRET:__weblogic-credentials__:username@@"
NodeManagerPasswordEncrypted: "@@SECRET:__weblogic-credentials__:password@@"

SecureMode:
SecureModeEnabled: false

resources:
SelfTuning:
MinThreadsConstraint:
Expand Down Expand Up @@ -198,4 +200,4 @@ EOF
done

# print model
cat ${filePath}
cat ${filePath}
2 changes: 1 addition & 1 deletion weblogic-azure-aks/src/main/arm/scripts/inline-scripts/queryDomainConfigurations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fi

echo "Query WebLogic version and patch numbers"
targetFile4Versions=/tmp/version.info
kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
-- bash -c 'source $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh > /dev/null 2>&1 && java weblogic.version -verbose >"'${targetFile4Versions}'"'
if [ $? != 0 ]; then
echo >&2 "Fail to run java weblogic.version."
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ EOF
echo "copy test script ${testDatasourceScript} to pod path /tmp/${dsScriptFileName}"
targetDSFilePath=/tmp/${dsScriptFileName}
kubectl cp ${testDatasourceScript} -n ${wlsDomainNS} ${podName}:${targetDSFilePath}
kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running"
kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running"

if [ $? == 1 ];then
echo_stderr "Failed to configure datasource ${JDBC_DATASOURCE_NAME}. Please make sure the input values are correct."
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ function parsing_ssl_certs_and_create_ssl_secret() {
--from-literal=ssltruststorepassword=${WLS_SSL_TRUST_PASSWORD}

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

Expand Down
4 changes: 2 additions & 2 deletions weblogic-azure-aks/src/main/arm/scripts/utility.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ function utility_validate_application_status() {
local targetFilePath=/tmp/checkApplicationStatus.py
echo "copy ${pyScriptPath} to ${targetFilePath}"
kubectl cp ${pyScriptPath} -n ${wlsDomainNS} ${podName}:${targetFilePath}
kubectl exec -it ${podName} -n ${wlsDomainNS} -c "weblogic-server" \
kubectl exec ${podName} -n ${wlsDomainNS} -c "weblogic-server" \
-- bash -c "wlst.sh ${targetFilePath} -user ${wlsUser} -password ${wlsPassword} -t3ChannelAddress ${t3ChannelAddress} -t3ChannelPort ${adminTargetPort}" |
grep "Summary: all applications are active"

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

counter=0
for item in $ret; do
Expand Down
2 changes: 1 addition & 1 deletion weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ install_kubectl

connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME

validate_app
validate_app
4 changes: 2 additions & 2 deletions weblogic-azure-aks/src/main/resources/aks_well_tested_version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Known-good version of Azure Kubernetes Service",
"description": "This version is known to work for all the features of Azure WebLogic on AKS offer.",
"value": "1.30.7",
"testedDate": "2025-02-10"
"value": "1.31.7",
"testedDate": "2025-05-08"
}
16 changes: 16 additions & 0 deletions weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@
"name": "Oracle WebLogic Server docker image tags mapping for Azure Marketplace offer",
"description": "List image tag mapping from Oracle Container Registry middleware/weblogic and middleware/weblogic_cpu repository.",
"items": [
{
"gaTag": "14.1.2.0-generic-jdk17-ol9",
"cpuTag": "14.1.2.0-generic-jdk17-ol9"
},
{
"gaTag": "14.1.2.0-generic-jdk21-ol9",
"cpuTag": "14.1.2.0-generic-jdk21-ol9"
},
{
"gaTag": "14.1.2.0-generic-jdk17-ol8",
"cpuTag": "14.1.2.0-generic-jdk17-ol8"
},
{
"gaTag": "14.1.2.0-generic-jdk21-ol8",
"cpuTag": "14.1.2.0-generic-jdk21-ol8"
},
{
"gaTag": "14.1.1.0-11",
"cpuTag": "14.1.1.0-generic-jdk11-ol7"
Expand Down
18 changes: 9 additions & 9 deletions weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
{
"key": "WDT",
"description": "Oracle WebLogic Deploy Tooling",
"version": "3.5.2",
"downloadURL": "https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-3.5.2/weblogic-deploy.zip",
"testedDate": "2024-03-13"
"version": "4.3.5",
"downloadURL": "https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-4.3.5/weblogic-deploy.zip",
"testedDate": "2025-05-26"
},
{
"key": "WIT",
"description": "Oracle WebLogic Image Tool",
"version": "1.13.2",
"downloadURL": "https://github.com/oracle/weblogic-image-tool/releases/download/release-1.13.2/imagetool.zip",
"testedDate": "2024-07-15"
"version": "1.15.0",
"downloadURL": "https://github.com/oracle/weblogic-image-tool/releases/download/release-1.15.0/imagetool.zip",
"testedDate": "2025-05-08"
},
{
"key": "WME",
"description": "Oracle Weblogic Monitoring Exporter. IMPORTANT note to maintener: This value is hard coded in enablePrometheusMetrics.sh. Please update it there also.",
"version": "2.1.9",
"imageURL": "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.9",
"testedDate": "2024-02-29"
"version": "2.3.0",
"imageURL": "ghcr.io/oracle/weblogic-monitoring-exporter:2.3.0",
"testedDate": "2025-05-08"
}
]
}