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 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 diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 708a49205..0f93d1f25 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -35,7 +35,8 @@ 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 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" @@ -54,7 +55,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 @@ -65,5 +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/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" +# 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" 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 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..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.2.0 + 1.2.2 - \ No newline at end of file +