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/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index 841c624db..7600b9c04 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 @@ -641,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\"]'),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." diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 708a49205..5d66cbe8a 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-11.2.3.jre8.jar" export constAzureCoreVersion="1.34.0" export constDbPodIdentitySelector="db-pod-identity" # do not change the value export constPreclassDirectoryName="preclassLibraries" @@ -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 @@ -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/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" diff --git a/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh b/weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh index 78b16e899..1c1c13413 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:ubuntu-24_04-lts:server:latest" if [[ "${CPU_PLATFORM}" == "${constARM64Platform}" ]]; then - ubuntuImage="Canonical:UbuntuServer:18_04-lts-arm64:latest" + ubuntuImage="Canonical:ubuntu-24_04-lts:server-arm64:latest" fi # query AKS vm size 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' 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/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' 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 +