Skip to content

Commit db8ae50

Browse files
edburnsgaliacheng
edburns
and
galiacheng
authored
On branch edburns/o-647-update-identity-driver (#352)
* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Update azure-identity-extensions.xml * Update common.sh to add azure-identity link. * Update common.sh to add constAzureIdentityForMSSQLJarName * Download azure-identity jar for MSSQL * 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 <[email protected]> * Update common.sh for variable name constAzureIdentityForMSSQLJarName * fix 'uri' expects its first argument to be a uri string * Use mssql 12.10 and azure-identity 1.15.3 * Update MSSQL driver version and remove azure-identity dependency * update the ubuntu base image * use SSO auth token * update description for Oracle SSO account password parameter to reflect auth token usage * use latest ubuntu 24 LTS * fix AMR64info condition * fix visibility condition for unsupported platform info in UI definition --------- Signed-off-by: Ed Burns <[email protected]> Co-authored-by: Haixia Cheng <[email protected]>
1 parent acb6872 commit db8ae50

File tree

9 files changed

+30
-20
lines changed

9 files changed

+30
-20
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.90</version.wls-on-aks-azure-marketplace>
43+
<version.wls-on-aks-azure-marketplace>1.0.91</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: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,18 +504,28 @@
504504
},
505505
"visible": true
506506
},
507+
{
508+
"name": "ocrSSOTokenInfo",
509+
"type": "Microsoft.Common.InfoBox",
510+
"visible": true,
511+
"options": {
512+
"icon": "Info",
513+
"text": "Please use an Auth Token associated with an SSO user. Select the link to see more details.",
514+
"uri": "https://aka.ms/wls-auth-token"
515+
}
516+
},
507517
{
508518
"name": "ocrSSOPassword",
509519
"type": "Microsoft.Common.PasswordBox",
510520
"label": {
511-
"password": "Password for Oracle Single Sign-On authentication",
512-
"confirmPassword": "Confirm password"
521+
"password": "Auth token for Oracle Single Sign-On authentication",
522+
"confirmPassword": "Confirm token"
513523
},
514-
"toolTip": "Password for Oracle Single Sign-On authentication to login the Oracle Container Registry.",
524+
"toolTip": "Auth token for Oracle Single Sign-On authentication to login the Oracle Container Registry.",
515525
"constraints": {
516526
"required": true,
517527
"regex": "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)[A-Za-z\\d\\$\\&\\+\\,:\\=\\?@#|'.\\^\\*!\\-_~/'\\[\\]\\{\\}\"]{8,}$",
518-
"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 > < ( ) % ; \\."
528+
"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 > < ( ) % ; \\."
519529
},
520530
"options": {
521531
"hideConfirmation": false
@@ -641,7 +651,7 @@
641651
{
642652
"name": "unsupportedPlatformInfo1",
643653
"type": "Microsoft.Common.InfoBox",
644-
"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))))]",
654+
"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)))]",
645655
"options": {
646656
"icon": "Error",
647657
"text": "The selected image is not compatible with the ARM64 platform. Please choose a different image or select a different size from <b>AKS</b> -> <b>Azure Kubernetes Service</b> -> <b>Node size</b>. For more information, see <a href=https://learn.microsoft.com/azure/virtual-machines/vm-naming-conventions>the Azure documentation</a>."

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export constFalse="false"
3535
export constTrue="true"
3636
export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos
3737
export constPostgreDriverName="postgresql-42.7.5.jar"
38-
export constMSSQLDriverName="mssql-jdbc-11.2.3.jre17.jar"
38+
export constMSSQLDriverName="mssql-jdbc-11.2.3.jre8.jar"
3939
export constAzureCoreVersion="1.34.0"
4040
export constDbPodIdentitySelector="db-pod-identity" # do not change the value
4141
export constPreclassDirectoryName="preclassLibraries"
@@ -54,7 +54,7 @@ export gitUrl4CpuImages="https://raw.githubusercontent.com/oracle/weblogic-azure
5454
export gitUrl4AksWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json"
5555
export gitUrl4AksToolingWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_tooling_well_tested_versions.json"
5656
export gitUrl4WLSToolingFamilyJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json"
57-
export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml"
57+
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"
5858
export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
5959

6060
export optUninstallMaxTry=5 # Max attempts to wait for the operator uninstalled
@@ -65,5 +65,5 @@ export retryInterval=10
6565

6666
export wlsContainerName="weblogic-server"
6767
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"
69-
export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz"
68+
export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/11.2.3.jre8/mssql-jdbc-11.2.3.jre8.jar"
69+
export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ function build_docker_image() {
9696
# Create vm to build docker image
9797
vmName="VM-UBUNTU-WLS-AKS-$(date +%s)"
9898

99-
# az vm image list --publisher Canonical --offer UbuntuServer --all -o table
100-
ubuntuImage="Canonical:UbuntuServer:18.04-LTS:latest"
99+
# az vm image list --publisher Canonical --offer 0001-com-ubuntu-server-focal --all -o table
100+
ubuntuImage="Canonical:ubuntu-24_04-lts:server:latest"
101101

102102
if [[ "${CPU_PLATFORM}" == "${constARM64Platform}" ]]; then
103-
ubuntuImage="Canonical:UbuntuServer:18_04-lts-arm64:latest"
103+
ubuntuImage="Canonical:ubuntu-24_04-lts:server-arm64:latest"
104104
fi
105105

106106
# query AKS vm size

‎weblogic-azure-aks/src/main/bicep/mainTemplate.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ param managedServerPrefix string = 'managed-server'
165165
@description('To mitigate ARM-TTK error: Control Named vnetForApplicationGateway must output the newOrExisting property when hideExisting is false')
166166
param newOrExistingVnetForApplicationGateway string = 'new'
167167
@secure()
168-
@description('Password of Oracle SSO account.')
168+
@description('Auth token of Oracle SSO account.')
169169
param ocrSSOPSW string = newGuid()
170170
@description('User name of Oracle SSO account.')
171171
param ocrSSOUser string = 'null'

‎weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ module configDataSource '_deployment-scripts/_ds-datasource-connection.bicep' =
136136
dbConfigurationType: dbConfigurationType
137137
dbGlobalTranPro: dbGlobalTranPro
138138
dbUser: dbUser
139-
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]), '')
139+
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])
140140
enablePswlessConnection: true
141141
identity: identity
142142
jdbcDataSourceName: jdbcDataSourceName

‎weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ param location string
7777
@description('Name prefix of managed server.')
7878
param managedServerPrefix string = 'managed-server'
7979
@secure()
80-
@description('Password of Oracle SSO account.')
80+
@description('Auth token of Oracle SSO account.')
8181
param ocrSSOPSW string
8282
@description('User name of Oracle SSO account.')
8383
param ocrSSOUser string

‎weblogic-azure-aks/src/main/bicep/modules/updateWebLogicApplications.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Parameters
2121
- containerName: container name.
2222
- 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.
2323
- isSSOSupportEntitled: Is the specified SSO account associated with an active Oracle support contract?
24-
- 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.
24+
- 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.
2525
- ocrSSOUser: User name of Oracle SSO account.
2626
- wlsDomainName: Name of the domain that you are going to update. Make sure it's the same with the initial cluster deployment.
2727
- 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 = {}
5656
@description('Is the specified SSO account associated with an active Oracle support contract?')
5757
param isSSOSupportEntitled bool = false
5858
@secure()
59-
@description('Password of Oracle SSO account.')
59+
@description('Auth token of Oracle SSO account.')
6060
param ocrSSOPSW string = 'null'
6161
@description('User name of Oracle SSO account.')
6262
param ocrSSOUser string = 'null'

‎weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>com.azure</groupId>
1717
<artifactId>azure-identity-extensions</artifactId>
18-
<version>1.2.0</version>
18+
<version>1.2.2</version>
1919
</dependency>
2020
</dependencies>
21-
</project>
21+
</project>

0 commit comments

Comments
 (0)