From d0fae69b3d346cd9cce8c621044055d7bcf8d545 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 10 Jun 2025 16:52:43 -0700 Subject: [PATCH 01/18] On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/arm/scripts/common.sh - Update MSSQLDriver to version that works with azure-identity 1.12.2. Signed-off-by: Ed Burns --- weblogic-azure-aks/src/main/arm/scripts/common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 708a49205..774624f9b 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -35,7 +35,7 @@ export constFalse="false" export constTrue="true" export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos export constPostgreDriverName="postgresql-42.7.5.jar" -export constMSSQLDriverName="mssql-jdbc-11.2.3.jre17.jar" +export constMSSQLDriverName="mssql-jdbc-12.8.1.jre11.jar" export constAzureCoreVersion="1.34.0" export constDbPodIdentitySelector="db-pod-identity" # do not change the value export constPreclassDirectoryName="preclassLibraries" @@ -65,5 +65,5 @@ export retryInterval=10 export wlsContainerName="weblogic-server" 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" \ No newline at end of file +export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/12.8.1.jre11/mssql-jdbc-12.8.1.jre11.jar" +export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz" From b67a5f95a6c2f590fe8ff938daa298fe7adf7a45 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 10 Jun 2025 17:03:08 -0700 Subject: [PATCH 02/18] On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml Cause dependency on `com.azure:azure-identity-extensions:jar:1.12.2:compile`. Signed-off-by: Ed Burns --- .../src/main/resources/azure-identity-extensions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml b/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml index e786947da..1b397de7e 100644 --- a/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml +++ b/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml @@ -15,7 +15,7 @@ com.azure azure-identity-extensions - 1.2.0 + 1.12.2 - \ No newline at end of file + From d90e31578a2f9a7afc8f8fce4c92ca17699bda00 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 10 Jun 2025 17:06:54 -0700 Subject: [PATCH 03/18] On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/arm/scripts/common.sh - Make it so the POM is resolvable during testing of the offer. Signed-off-by: Ed Burns --- weblogic-azure-aks/src/main/arm/scripts/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 774624f9b..6ace34f33 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -54,7 +54,7 @@ export gitUrl4CpuImages="https://raw.githubusercontent.com/oracle/weblogic-azure export gitUrl4AksWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json" export gitUrl4AksToolingWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_tooling_well_tested_versions.json" export gitUrl4WLSToolingFamilyJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json" -export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" +export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/b67a5f95a6c2f590fe8ff938daa298fe7adf7a45/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" # PR https://github.com/oracle/weblogic-azure/pull/352 "https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml" export optUninstallMaxTry=5 # Max attempts to wait for the operator uninstalled From 868080da5abf1b654b3eb6658b32aeeb41ed1d0a Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Wed, 11 Jun 2025 09:39:41 +0800 Subject: [PATCH 04/18] Update azure-identity-extensions.xml --- .../src/main/resources/azure-identity-extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml b/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml index 1b397de7e..10dd0e771 100644 --- a/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml +++ b/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml @@ -15,7 +15,7 @@ com.azure azure-identity-extensions - 1.12.2 + 1.2.2 From 59b076c7e6498c5ec2c59ec5c1612f02736fc2a5 Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Wed, 11 Jun 2025 09:45:20 +0800 Subject: [PATCH 05/18] Update common.sh to add azure-identity link. --- weblogic-azure-aks/src/main/arm/scripts/common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 6ace34f33..bb6e3f554 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -66,4 +66,6 @@ export retryInterval=10 export wlsContainerName="weblogic-server" export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.7.5.jar" export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/12.8.1.jre11/mssql-jdbc-12.8.1.jre11.jar" +# The azure-identity is required by specified MSSQL driver, see https://learn.microsoft.com/en-us/sql/connect/jdbc/connecting-using-azure-active-directory-authentication?view=sql-server-ver17#connect-using-activedirectorymanagedidentity-authentication-mode +export azureIdentityForMSSQLUrl="https://repo1.maven.org/maven2/com/azure/azure-identity/1.12.2/azure-identity-1.12.2.jar" export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz" From 70c3a9e2253a4a81f6cf1caf3eaeadfb3aed52ab Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Wed, 11 Jun 2025 09:51:03 +0800 Subject: [PATCH 06/18] Update common.sh to add constAzureIdentityForMSSQLJarName --- weblogic-azure-aks/src/main/arm/scripts/common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index bb6e3f554..fa867e67e 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -36,6 +36,7 @@ export constTrue="true" export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos export constPostgreDriverName="postgresql-42.7.5.jar" export constMSSQLDriverName="mssql-jdbc-12.8.1.jre11.jar" +export constAzureIdentityForMSSQLName="azure-identity-1.12.2.jar" export constAzureCoreVersion="1.34.0" export constDbPodIdentitySelector="db-pod-identity" # do not change the value export constPreclassDirectoryName="preclassLibraries" From 99fa685456b80d92e3098acb4f05f04734b665df Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Wed, 11 Jun 2025 09:52:13 +0800 Subject: [PATCH 07/18] Download azure-identity jar for MSSQL --- .../src/main/arm/scripts/buildWLSDockerImage.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh b/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh index 03dc722df..655439abd 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh @@ -293,6 +293,10 @@ function install_utilities() { --retry ${retryMaxAttempt} \ -fL ${wlsMSSQLDriverUrl} \ -o ${scriptDir}/model-images/wlsdeploy/${externalJDBCLibrariesDirectoryName}/${constMSSQLDriverName} + curl -m ${curlMaxTime} \ + --retry ${retryMaxAttempt} \ + -fL ${azureIdentityForMSSQLUrl} \ + -o ${scriptDir}/model-images/wlsdeploy/${externalJDBCLibrariesDirectoryName}/${constAzureIdentityForMSSQLJarName} validate_status "Install mssql driver." fi From 7b4b2cc83f8888ba2e1130662a468bbd553fdb58 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 10 Jun 2025 19:17:31 -0700 Subject: [PATCH 08/18] On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/arm/scripts/common.sh - Make it so the POM is resolvable during testing of the offer. Signed-off-by: Ed Burns --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70ef52d3b..ea8f54ff2 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ - 1.0.90 + 1.0.91 1.0.31 1.0.56 From 856eb6921f73e0e02c897fbaf3b0e00c14dc871a Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Sun, 15 Jun 2025 21:14:52 +0800 Subject: [PATCH 09/18] Update common.sh for variable name constAzureIdentityForMSSQLJarName --- weblogic-azure-aks/src/main/arm/scripts/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index fa867e67e..0f93d1f25 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -36,7 +36,7 @@ export constTrue="true" export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos export constPostgreDriverName="postgresql-42.7.5.jar" export constMSSQLDriverName="mssql-jdbc-12.8.1.jre11.jar" -export constAzureIdentityForMSSQLName="azure-identity-1.12.2.jar" +export constAzureIdentityForMSSQLJarName="azure-identity-1.12.2.jar" export constAzureCoreVersion="1.34.0" export constDbPodIdentitySelector="db-pod-identity" # do not change the value export constPreclassDirectoryName="preclassLibraries" From 349e454c1256c3bb5bf5d8fdb96558afe175867d Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Mon, 16 Jun 2025 16:35:44 +0800 Subject: [PATCH 10/18] fix 'uri' expects its first argument to be a uri string --- .../src/main/bicep/modules/_setupPasswordlessDBConnection.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep index a431ba321..64ca5af4e 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep @@ -136,7 +136,7 @@ module configDataSource '_deployment-scripts/_ds-datasource-connection.bicep' = dbConfigurationType: dbConfigurationType dbGlobalTranPro: dbGlobalTranPro dbUser: dbUser - dsConnectionURL: uri(format('{0}{4}{1}{4}{3}={2}', const_connectionString, name_jdbcPlugins[databaseType], reference(items(dbIdentity.userAssignedIdentities)[0].key, const_identityAPIVersion, 'full').properties.clientId, array_msiClientId[databaseType], array_urlJoiner[databaseType]), '') + dsConnectionURL: format('{0}{4}{1}{4}{3}={2}', const_connectionString, name_jdbcPlugins[databaseType], reference(items(dbIdentity.userAssignedIdentities)[0].key, const_identityAPIVersion, 'full').properties.clientId, array_msiClientId[databaseType], array_urlJoiner[databaseType]) enablePswlessConnection: true identity: identity jdbcDataSourceName: jdbcDataSourceName From a6bfe2d78181ab31c71f57b72075ad560e14ba3c Mon Sep 17 00:00:00 2001 From: Haixia Cheng Date: Mon, 23 Jun 2025 14:01:03 +0800 Subject: [PATCH 11/18] Use mssql 12.10 and azure-identity 1.15.3 --- weblogic-azure-aks/src/main/arm/scripts/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 0f93d1f25..36fbdd56f 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -66,7 +66,7 @@ export retryInterval=10 export wlsContainerName="weblogic-server" export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.7.5.jar" -export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/12.8.1.jre11/mssql-jdbc-12.8.1.jre11.jar" +export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/12.10.0.jre8/mssql-jdbc-12.10.0.jre8.jar" # The azure-identity is required by specified MSSQL driver, see https://learn.microsoft.com/en-us/sql/connect/jdbc/connecting-using-azure-active-directory-authentication?view=sql-server-ver17#connect-using-activedirectorymanagedidentity-authentication-mode -export azureIdentityForMSSQLUrl="https://repo1.maven.org/maven2/com/azure/azure-identity/1.12.2/azure-identity-1.12.2.jar" +export azureIdentityForMSSQLUrl="https://repo1.maven.org/maven2/com/azure/azure-identity/1.15.3/azure-identity-1.15.3.jar" export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz" From 9ebc37394157d93f5b7f4045cd8bd6a6c76c48a0 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Thu, 3 Jul 2025 04:12:19 +0000 Subject: [PATCH 12/18] Update MSSQL driver version and remove azure-identity dependency --- .../src/main/arm/scripts/buildWLSDockerImage.sh | 4 ---- weblogic-azure-aks/src/main/arm/scripts/common.sh | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh b/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh index 655439abd..03dc722df 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh @@ -293,10 +293,6 @@ function install_utilities() { --retry ${retryMaxAttempt} \ -fL ${wlsMSSQLDriverUrl} \ -o ${scriptDir}/model-images/wlsdeploy/${externalJDBCLibrariesDirectoryName}/${constMSSQLDriverName} - curl -m ${curlMaxTime} \ - --retry ${retryMaxAttempt} \ - -fL ${azureIdentityForMSSQLUrl} \ - -o ${scriptDir}/model-images/wlsdeploy/${externalJDBCLibrariesDirectoryName}/${constAzureIdentityForMSSQLJarName} validate_status "Install mssql driver." fi diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 36fbdd56f..5d66cbe8a 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -35,8 +35,7 @@ export constFalse="false" export constTrue="true" export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos export constPostgreDriverName="postgresql-42.7.5.jar" -export constMSSQLDriverName="mssql-jdbc-12.8.1.jre11.jar" -export constAzureIdentityForMSSQLJarName="azure-identity-1.12.2.jar" +export constMSSQLDriverName="mssql-jdbc-11.2.3.jre8.jar" export constAzureCoreVersion="1.34.0" export constDbPodIdentitySelector="db-pod-identity" # do not change the value export constPreclassDirectoryName="preclassLibraries" @@ -66,7 +65,5 @@ export retryInterval=10 export wlsContainerName="weblogic-server" export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.7.5.jar" -export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/12.10.0.jre8/mssql-jdbc-12.10.0.jre8.jar" -# The azure-identity is required by specified MSSQL driver, see https://learn.microsoft.com/en-us/sql/connect/jdbc/connecting-using-azure-active-directory-authentication?view=sql-server-ver17#connect-using-activedirectorymanagedidentity-authentication-mode -export azureIdentityForMSSQLUrl="https://repo1.maven.org/maven2/com/azure/azure-identity/1.15.3/azure-identity-1.15.3.jar" +export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/11.2.3.jre8/mssql-jdbc-11.2.3.jre8.jar" export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz" From 5d65d525692c68da30feb85ea604d79542b8b396 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Fri, 11 Jul 2025 09:43:44 +0000 Subject: [PATCH 13/18] update the ubuntu base image --- .../src/main/arm/scripts/createVMAndBuildImage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh index 78b16e899..d796034b4 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh @@ -96,11 +96,11 @@ function build_docker_image() { # Create vm to build docker image vmName="VM-UBUNTU-WLS-AKS-$(date +%s)" - # az vm image list --publisher Canonical --offer UbuntuServer --all -o table - ubuntuImage="Canonical:UbuntuServer:18.04-LTS:latest" + # az vm image list --publisher Canonical --offer 0001-com-ubuntu-server-focal --all -o table + ubuntuImage="canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:latest" if [[ "${CPU_PLATFORM}" == "${constARM64Platform}" ]]; then - ubuntuImage="Canonical:UbuntuServer:18_04-lts-arm64:latest" + ubuntuImage="canonical:0001-com-ubuntu-server-focal:20_04-lts-arm64:latest" fi # query AKS vm size From e088e8872eaf26dd99dfbea28b5939063c82f163 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Sat, 12 Jul 2025 03:10:20 +0000 Subject: [PATCH 14/18] use SSO auth token --- .../src/main/arm/createUiDefinition.json | 18 ++++++++++++++---- .../bicep/modules/setupWebLogicCluster.bicep | 2 +- .../modules/updateWebLogicApplications.bicep | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 841c624db..4b8f63ae8 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -504,18 +504,28 @@ }, "visible": true }, + { + "name": "ocrSSOTokenInfo", + "type": "Microsoft.Common.InfoBox", + "visible": true, + "options": { + "icon": "Info", + "text": "Please use an Auth Token associated with an SSO user. Select the link to see more details.", + "uri": "https://aka.ms/wls-auth-token" + } + }, { "name": "ocrSSOPassword", "type": "Microsoft.Common.PasswordBox", "label": { - "password": "Password for Oracle Single Sign-On authentication", - "confirmPassword": "Confirm password" + "password": "Auth token for Oracle Single Sign-On authentication", + "confirmPassword": "Confirm token" }, - "toolTip": "Password for Oracle Single Sign-On authentication to login the Oracle Container Registry.", + "toolTip": "Auth token for Oracle Single Sign-On authentication to login the Oracle Container Registry.", "constraints": { "required": true, "regex": "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)[A-Za-z\\d\\$\\&\\+\\,:\\=\\?@#|'.\\^\\*!\\-_~/'\\[\\]\\{\\}\"]{8,}$", - "validationMessage": "The password must contain at least 8 characters, with at least 1 uppercase letter, 1 lowercase letter and 1 number, and special characters, but should not contain > < ( ) % ; \\." + "validationMessage": "The token must contain at least 8 characters, with at least 1 uppercase letter, 1 lowercase letter and 1 number, and special characters, but should not contain > < ( ) % ; \\." }, "options": { "hideConfirmation": false diff --git a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep index 4a91bbfc7..47666bdee 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep @@ -77,7 +77,7 @@ param location string @description('Name prefix of managed server.') param managedServerPrefix string = 'managed-server' @secure() -@description('Password of Oracle SSO account.') +@description('Auth token of Oracle SSO account.') param ocrSSOPSW string @description('User name of Oracle SSO account.') param ocrSSOUser string diff --git a/weblogic-azure-aks/src/main/bicep/modules/updateWebLogicApplications.bicep b/weblogic-azure-aks/src/main/bicep/modules/updateWebLogicApplications.bicep index c190e76d4..c94c548ef 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/updateWebLogicApplications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/updateWebLogicApplications.bicep @@ -21,7 +21,7 @@ Parameters - containerName: container name. - identity: Azure user managed identity used, make sure the identity has permission to create/update/delete Azure resources. It's recommended to assign "Contributor" role. - isSSOSupportEntitled: Is the specified SSO account associated with an active Oracle support contract? - - ocrSSOPSW: Password of Oracle SSO account. The script will pull image from Oracle Container Registry (OCR), Oracle account is required. Make sure the account has checkout WebLogic images. + - ocrSSOPSW: Auth token of Oracle SSO account. The script will pull image from Oracle Container Registry (OCR), Oracle account is required. Make sure the account has checkout WebLogic images. - ocrSSOUser: User name of Oracle SSO account. - wlsDomainName: Name of the domain that you are going to update. Make sure it's the same with the initial cluster deployment. - wlsDomainUID: UID of the domain that you are going to update. Make sure it's the same with the initial cluster deployment. @@ -56,7 +56,7 @@ param identity object = {} @description('Is the specified SSO account associated with an active Oracle support contract?') param isSSOSupportEntitled bool = false @secure() -@description('Password of Oracle SSO account.') +@description('Auth token of Oracle SSO account.') param ocrSSOPSW string = 'null' @description('User name of Oracle SSO account.') param ocrSSOUser string = 'null' From 4131ba9804e594c7c40d80fc633606cdfb6b9745 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Sat, 12 Jul 2025 03:58:48 +0000 Subject: [PATCH 15/18] update description for Oracle SSO account password parameter to reflect auth token usage --- weblogic-azure-aks/src/main/bicep/mainTemplate.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep index 54058c483..ad7c7a5fa 100644 --- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep +++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep @@ -165,7 +165,7 @@ param managedServerPrefix string = 'managed-server' @description('To mitigate ARM-TTK error: Control Named vnetForApplicationGateway must output the newOrExisting property when hideExisting is false') param newOrExistingVnetForApplicationGateway string = 'new' @secure() -@description('Password of Oracle SSO account.') +@description('Auth token of Oracle SSO account.') param ocrSSOPSW string = newGuid() @description('User name of Oracle SSO account.') param ocrSSOUser string = 'null' From 615099f0a01ebdd5114661060664c66861b9b7ff Mon Sep 17 00:00:00 2001 From: galiacheng Date: Sat, 12 Jul 2025 04:53:26 +0000 Subject: [PATCH 16/18] use latest ubuntu 24 LTS --- .../src/main/arm/scripts/createVMAndBuildImage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh index d796034b4..1c1c13413 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh @@ -97,10 +97,10 @@ function build_docker_image() { vmName="VM-UBUNTU-WLS-AKS-$(date +%s)" # az vm image list --publisher Canonical --offer 0001-com-ubuntu-server-focal --all -o table - ubuntuImage="canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:latest" + ubuntuImage="Canonical:ubuntu-24_04-lts:server:latest" if [[ "${CPU_PLATFORM}" == "${constARM64Platform}" ]]; then - ubuntuImage="canonical:0001-com-ubuntu-server-focal:20_04-lts-arm64:latest" + ubuntuImage="Canonical:ubuntu-24_04-lts:server-arm64:latest" fi # query AKS vm size From 7e6348ac08140fd0ae1d2939d8f433d1def6dae6 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Sat, 12 Jul 2025 05:03:07 +0000 Subject: [PATCH 17/18] fix AMR64info condition --- weblogic-azure-aks/src/main/arm/createUiDefinition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 4b8f63ae8..7132fe4e5 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -651,7 +651,7 @@ { "name": "unsupportedPlatformInfo1", "type": "Microsoft.Common.InfoBox", - "visible": "[and(contains(steps('section_aks').clusterInfo.nodeVMSizeSelector,'p'), not(contains(parse('[\"14.1.1.0-11\", \"14.1.1.0-8\", \"14.1.1.0-slim-11\", \"14.1.1.0-slim-8\", \"12.2.1.4\", \"12.2.1.4-slim\"]'),if(equals(steps('section_aks').imageInfo.oracleImageSelector, 'others'), steps('section_aks').imageInfo.fromOracleImage, steps('section_aks').imageInfo.oracleImageSelector))))]", + "visible": "[and(contains(steps('section_aks').clusterInfo.nodeVMSizeSelector,'p'), contains(parse('[\"14.1.1.0-11\", \"14.1.1.0-8\", \"14.1.1.0-slim-11\", \"14.1.1.0-slim-8\", \"12.2.1.4\", \"12.2.1.4-slim\"]')),not(if(equals(steps('section_aks').imageInfo.oracleImageSelector, 'others'), steps('section_aks').imageInfo.fromOracleImage, steps('section_aks').imageInfo.oracleImageSelector)))]", "options": { "icon": "Error", "text": "The selected image is not compatible with the ARM64 platform. Please choose a different image or select a different size from AKS -> Azure Kubernetes Service -> Node size. For more information, see the Azure documentation." From 452524da21e872ee99b7b043aa5b4b0e35e0e8f0 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Sat, 12 Jul 2025 05:13:17 +0000 Subject: [PATCH 18/18] fix visibility condition for unsupported platform info in UI definition --- weblogic-azure-aks/src/main/arm/createUiDefinition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 7132fe4e5..7600b9c04 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -651,7 +651,7 @@ { "name": "unsupportedPlatformInfo1", "type": "Microsoft.Common.InfoBox", - "visible": "[and(contains(steps('section_aks').clusterInfo.nodeVMSizeSelector,'p'), contains(parse('[\"14.1.1.0-11\", \"14.1.1.0-8\", \"14.1.1.0-slim-11\", \"14.1.1.0-slim-8\", \"12.2.1.4\", \"12.2.1.4-slim\"]')),not(if(equals(steps('section_aks').imageInfo.oracleImageSelector, 'others'), steps('section_aks').imageInfo.fromOracleImage, steps('section_aks').imageInfo.oracleImageSelector)))]", + "visible": "[and(contains(steps('section_aks').clusterInfo.nodeVMSizeSelector,'p'), contains(parse('[\"14.1.1.0-11\", \"14.1.1.0-8\", \"14.1.1.0-slim-11\", \"14.1.1.0-slim-8\", \"12.2.1.4\", \"12.2.1.4-slim\"]'),if(equals(steps('section_aks').imageInfo.oracleImageSelector, 'others'), steps('section_aks').imageInfo.fromOracleImage, steps('section_aks').imageInfo.oracleImageSelector)))]", "options": { "icon": "Error", "text": "The selected image is not compatible with the ARM64 platform. Please choose a different image or select a different size from AKS -> Azure Kubernetes Service -> Node size. For more information, see the Azure documentation."