Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
dd7406a
update API version of Microsoft.Storage/storageAccounts.
galiacheng Feb 11, 2025
d95dc7c
remove external key vault integration.
galiacheng Feb 11, 2025
9c87293
remove external key vault support.
galiacheng Feb 11, 2025
e37128d
Unreferenced variable: const_currentSubscription.
galiacheng Feb 11, 2025
6fd6987
fix json syntax
galiacheng Feb 11, 2025
9cbad5d
parameterize location in integration test.
galiacheng Feb 11, 2025
3d772b2
rename the postgresql firewall rule.
galiacheng Feb 11, 2025
0934b91
debug pipeline.
galiacheng Feb 12, 2025
262d03e
add global unique suffix to resource name.
galiacheng Feb 12, 2025
75514f4
remove aad and elk related scripts.
galiacheng Feb 12, 2025
4e17a0f
remove elk from admin integration pipeline.
galiacheng Feb 12, 2025
dbbc158
output admin vm name.
galiacheng Feb 12, 2025
0931b63
query admin vm name after deployment in the admin integration pipeline.
galiacheng Feb 12, 2025
3acac94
Unreferenced parameter: _globalResourceNameSuffix Line: 18, Column: 10
galiacheng Feb 12, 2025
f242bd3
remove aad parameter from the test scripts.
galiacheng Feb 12, 2025
6b16187
parameterize file share name.
galiacheng Feb 12, 2025
d6635b6
define nsg name in the main template.
galiacheng Feb 12, 2025
9f6a297
generate unique vnet default name.
galiacheng Feb 12, 2025
89ece34
query nsg name dynamically.
galiacheng Feb 12, 2025
8c0c866
output admin vm name as env variables.
galiacheng Feb 12, 2025
7270939
use `az vm run-command create` to execute test script.
galiacheng Feb 12, 2025
2326dbe
no need to verify WLS installation, this is done while buiding base i…
galiacheng Feb 12, 2025
b1f192d
use `az vm run-command invoke` to run test script.
galiacheng Feb 12, 2025
82edc5b
verify-wls-path.sh has been removed.
galiacheng Feb 12, 2025
e416855
fix pipeline error "Error: Process completed with exit code 1."
galiacheng Feb 13, 2025
216a2c3
upgrade db driver version.
galiacheng Feb 13, 2025
c367b0d
fix db connection string joiner.
galiacheng Feb 13, 2025
8c9f8da
update the script for new azure-identity-extension.
galiacheng Feb 13, 2025
0d17cc3
add step to query public IP of AdminServer VM in workflow.
galiacheng Feb 13, 2025
01a323b
bump version of arm-oraclelinux-wls-admin to 1.0.56
galiacheng Feb 13, 2025
8264f0e
add network security group configuration step to workflow
galiacheng Feb 13, 2025
e05ade9
update connection string joiner to use variables instead of parameters
galiacheng Feb 13, 2025
bfc23e1
deploy db in the main deployment.
galiacheng Feb 13, 2025
138daa1
remove post deployment - db.
galiacheng Feb 13, 2025
c28f754
use unique vnet default name.
galiacheng Feb 13, 2025
0d7cefe
revert debug settings.
galiacheng Feb 13, 2025
398c164
add array_paramJoiner for database connection string formatting.
galiacheng Feb 14, 2025
0c0eb63
Merge branch 'main' into wls-vm-admin-redeploy
edburns Feb 19, 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 .github/actions/createPostgresqlFlexibleServer/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ runs:
az postgres flexible-server firewall-rule create \
-g ${{ inputs.resourceGroupName }} \
-n ${{ inputs.dbName }} \
-r "AllowAllWindowsAzureIps" \
-r "AllowAllAzureServices" \
--start-ip-address "0.0.0.0" \
--end-ip-address "0.0.0.0"
285 changes: 83 additions & 202 deletions .github/workflows/testWlsVmAdmin.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<version.wls-on-aks-azure-marketplace>1.0.87</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.55</version.arm-oraclelinux-wls-admin>
<version.arm-oraclelinux-wls-admin>1.0.56</version.arm-oraclelinux-wls-admin>
<version.arm-oraclelinux-wls-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
<!-- node versions -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity-extensions</artifactId>
<version>1.0.0</version>
<version>1.2.0</version>
</dependency>
</dependencies>
</project>
12 changes: 7 additions & 5 deletions weblogic-azure-aks/src/main/resources/mysql-connector-java.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- mvn dependency:copy-dependencies -f azure-identity-provider-jdbc-mysql.xml -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.weblogic.azure</groupId>
<artifactId>mysql-driver</artifactId>
Expand All @@ -12,11 +13,12 @@
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.31</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.2.0</version>
</dependency>

</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"aadsPortNumber": {
"value": "GEN-UNIQUE"
},
"aadsPublicIP": {
"value": "GEN-UNIQUE"
},
"aadsServerHost": {
"value": "GEN-UNIQUE"
},
"adminPasswordOrKey": {
"value": "GEN-SSH-PUB-KEY"
},
Expand Down Expand Up @@ -38,9 +29,6 @@
"dsUser": {
"value": "GEN-UNIQUE"
},
"enableAAD": {
"value": "GEN-UNIQUE"
},
"enableDB": {
"value": "GEN-UNIQUE"
},
Expand All @@ -53,24 +41,6 @@
"wlsDomainName": {
"value": "GEN-UNIQUE"
},
"wlsLDAPProviderName": {
"value": "GEN-UNIQUE"
},
"wlsLDAPPrincipal": {
"value": "GEN-UNIQUE"
},
"wlsLDAPPrincipalPassword": {
"value": "GEN-UNIQUE"
},
"wlsLDAPUserBaseDN": {
"value": "GEN-UNIQUE"
},
"wlsLDAPGroupBaseDN": {
"value": "GEN-UNIQUE"
},
"wlsLDAPSSLCertificate": {
"value": "GEN-UNIQUE"
},
"wlsPassword": {
"value": "GEN-PASSWORD"
},
Expand Down

Large diffs are not rendered by default.

Loading