Skip to content

Commit 930776f

Browse files
galiachenggaliacheng
authored
Support redeployment in the same resource group and remove external key vault integration for configured cluster offer (#341)
* remove elk related code. * remove aad related code. * remove elk and aad test data. * remove external key vault. * update ARM aPI version. * update deployment location from eastus to westus * fix arm-ttk errors. * remove external key vault from test scripts. * debug param verification. * fix tags in post deployment scripts. * add artifact download paths * add new parameters for WebLogic Azure VM deployment configuration * add global resource suffix. * remove obsolete parameters-test.json and update service verification scripts * remove obsolete _globalResourceNameSuffix parameter from pswlessDbTemplate.json * add global resource name suffix to clusterLinkedTemplate deployment * fix parameter issue. * fix "invalid skuUrnVersion" * fix: correct service principal name in Azure credential setup * update skuUrnVersion formatting * correct typo in admin service verification and remove unused parameters from main template * update resource dependencies in main template * update key vault references in main template * update domainNameLabel construction in cluster templates * update virtual network name formatting in UI definition and main template * correct formatting of azure subject name in main template * refactor key vault script parameters and output handling for improved readability * update naming conventions for network security group and availability set in ARM templates * fix syntax error near unexpected token `||' in testWlsVmCluster.yml * bump version for oraclelinux wls cluster to 1.0.720000 * update gatewayPublicIPAddressName to include resource name suffix in main template * rename parameter adminVMName with adminVMNamePrefix, the adminVMName will be output. * add managedVMNamePrefix parameter to various templates for consistent VM naming * update defaultValue for virtualNetworkName to use uniqueString for better name uniqueness * add managedVMNamePrefix to appGatewayNestedTemplate for consistent VM naming * fix typo * update default pidType to 'oracle' in workflow configuration files * update admin VM public IP retrieval logic in workflow * add appGatewayName parameter to templates for improved Application Gateway configuration * add WebLogic edit session header to curl commands in deploy-webapp.sh * add appGatewayName parameter * add WebLogic edit session header to curl commands in deploy-webapp.sh * appGatewayNestedTemplate.json: use array for backend trusted root certs * update mainTemplate.json to conditionally reference SSL certificate details based on appGatewayCertificateOption * set enableCoherence to false in gen-parameters-deploy.sh * add virtual network and subnet parameters to gen-parameters-deploy.sh * fix verify-webapp-deployment.sh: correct URL formatting for WebLogic Cafe REST API call * set enableCoherence to true in gen-parameters-deploy.sh * remove post deployments as those templates are not working currently. * remove elk steps in testWlsVmCluster.yml * fix verify-webapp-deployment.sh: improve URL formatting for WebLogic Cafe REST API call * refactor coherenceTemplate.json: rename keyVault parameters to ssl for clarity * remove unused output parameters from testWlsVmCluster.yml * add global resource name suffix and refactor VM naming conventions in coherence template * coherenceTemplate.json: make sure the dns name is unique.
1 parent 6fc3c67 commit 930776f

File tree

52 files changed

+964
-5148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+964
-5148
lines changed

‎.github/resource/azure-credential-setup-wls-aks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ echo "Creating Azure Service Principal with name: $SERVICE_PRINCIPAL_NAME_WLS_AK
1010
SUBSCRIPTION_ID=$(az account show --query id -o tsv| tr -d '\r\n')
1111

1212
AZURE_CREDENTIALS=$(az ad sp create-for-rbac --name ${SERVICE_PRINCIPAL_NAME_WLS_AKS} --role="Contributor" --scopes="/subscriptions/${SUBSCRIPTION_ID}" --sdk-auth --only-show-errors)
13-
SP_ID=$( az ad sp list --display-name $SERVICE_PRINCIPAL_NAME --query \[0\].id -o tsv | tr -d '\r\n')
13+
SP_ID=$( az ad sp list --display-name $SERVICE_PRINCIPAL_NAME_WLS_AKS --query \[0\].id -o tsv | tr -d '\r\n')
1414
az role assignment create --assignee ${SP_ID} --scope="/subscriptions/${SUBSCRIPTION_ID}" --role "User Access Administrator"
1515

1616
## Set the Azure Credentials as a secret in the repository

‎.github/workflows/buildWlsVm4AsArtifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pidType:
1111
description: 'Specify which pids to use, oracle or microsoft.'
1212
required: true
13-
default: 'microsoft'
13+
default: 'oracle'
1414
ref:
1515
description: 'Specify Git Ref if needed.'
1616
required: false

‎.github/workflows/buildWlsVm4CcArtifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
pidType:
1212
description: 'Specify which pids to use, oracle or microsoft.'
1313
required: true
14-
default: 'microsoft'
14+
default: 'oracle'
1515
ref:
1616
description: 'Specify Git Ref if needed.'
1717
required: false

‎.github/workflows/buildWlsVm4DcArtifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
pidType:
1212
description: 'Specify which pids to use, oracle or microsoft.'
1313
required: true
14-
default: 'microsoft'
14+
default: 'oracle'
1515
ref:
1616
description: 'Specify Git Ref if needed.'
1717
required: false

‎.github/workflows/buildWlsVm4SnArtifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pidType:
1111
description: 'Specify which pids to use, oracle or microsoft.'
1212
required: true
13-
default: 'microsoft'
13+
default: 'oracle'
1414
ref:
1515
description: 'Specify Git Ref if needed.'
1616
required: false

‎.github/workflows/testWlsVmCluster.yml

Lines changed: 110 additions & 570 deletions
Large diffs are not rendered by default.

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
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>
47-
<version.arm-oraclelinux-wls-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
47+
<version.arm-oraclelinux-wls-cluster>1.0.720000</version.arm-oraclelinux-wls-cluster>
4848
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
4949
<!-- node versions -->
5050
<version.arm-oraclelinux-wls-dynamic-cluster-addnode>1.0.7</version.arm-oraclelinux-wls-dynamic-cluster-addnode>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ param identity object = {}
6565

6666
@description('JNDI Name for JDBC Datasource')
6767
param jdbcDataSourceName string = 'jdbc/contoso'
68+
@description('tags for the resources')
69+
param tagsByResource object = {}
6870
param utcValue string = utcNow()
6971
@description('UID of WebLogic domain, used in WebLogic Operator.')
7072
param wlsDomainUID string = 'sample-domain1'

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/clusterdeploy.parameters.json

Lines changed: 154 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,121 @@
44
"parameters": {
55
"adminUsername": {
66
"value": "GEN-UNIQUE"
7-
},
7+
},
88
"adminPasswordOrKey": {
99
"value": "GEN-SSH-PUB-KEY"
1010
},
11+
"adminVMName":{
12+
"value": "GEN-UNIQUE"
13+
},
14+
"appGatewayCertificateOption":{
15+
"value": "GEN-UNIQUE"
16+
},
17+
"appGatewaySSLBackendCertData":{
18+
"value": "GEN-UNIQUE"
19+
},
20+
"appGatewaySSLCertData":{
21+
"value": "GEN-UNIQUE"
22+
},
23+
"appGatewaySSLCertPassword":{
24+
"value": "GEN-UNIQUE"
25+
},
26+
"authenticationType": {
27+
"value": "password"
28+
},
29+
"databaseType": {
30+
"value": "mysql"
31+
},
32+
"dbGlobalTranProperty": {
33+
"value": "OnePhaseCommit"
34+
},
35+
"dbIdentity": {
36+
"value": {}
37+
},
38+
"dbPassword": {
39+
"value": "GEN-UNIQUE"
40+
},
41+
"dbUser": {
42+
"value": "GEN-UNIQUE"
43+
},
44+
"denyPublicTrafficForManagedServer": {
45+
"value": false
46+
},
47+
"dsConnectionURL": {
48+
"value": "GEN-UNIQUE"
49+
},
1150
"dnsLabelPrefix": {
1251
"value": "GEN-UNIQUE"
1352
},
14-
"acceptOTNLicenseAgreement": {
53+
"dnsNameforApplicationGateway":{
1554
"value": "GEN-UNIQUE"
1655
},
17-
"otnAccountUsername": {
56+
"dnszoneName": {
1857
"value": "GEN-UNIQUE"
1958
},
20-
"otnAccountPassword": {
59+
"dnszoneResourceGroup": {
60+
"value": "GEN-UNIQUE"
61+
},
62+
"dnszoneAdminConsoleLabel": {
63+
"value": "GEN-UNIQUE"
64+
},
65+
"dnszoneAppGatewayLabel": {
66+
"value": "GEN-UNIQUE"
67+
},
68+
"enableAppGateway": {
69+
"value": false
70+
},
71+
"enableCoherence": {
72+
"value": false
73+
},
74+
"enableCoherenceWebLocalStorage": {
75+
"value": false
76+
},
77+
"enableCookieBasedAffinity": {
78+
"value": false
79+
},
80+
"enableDB": {
81+
"value": false
82+
},
83+
"enableDNSConfiguration": {
84+
"value": false
85+
},
86+
"enableHTTPAdminListenPort": {
87+
"value": false
88+
},
89+
"enablePswlessConnection": {
90+
"value": false
91+
},
92+
"gatewayPublicIPAddressName": {
2193
"value": "GEN-UNIQUE"
2294
},
95+
"hasDNSZones": {
96+
"value": false
97+
},
98+
"jdbcDataSourceName": {
99+
"value": "GEN-UNIQUE"
100+
},
101+
"keyVaultSku": {
102+
"value": "standard"
103+
},
104+
"location": {
105+
"value": "eastus"
106+
},
107+
"portsToExpose": {
108+
"value": "GEN-UNIQUE"
109+
},
110+
"skuUrnVersion": {
111+
"value": "GEN-UNIQUE"
112+
},
113+
"tagsByResource": {
114+
"value": {}
115+
},
116+
"usePreviewImage": {
117+
"value": false
118+
},
119+
"useSystemAssignedManagedIdentity": {
120+
"value": false
121+
},
23122
"wlsDomainName": {
24123
"value": "GEN-UNIQUE"
25124
},
@@ -32,20 +131,68 @@
32131
"managedServerPrefix":{
33132
"value": "GEN-UNIQUE"
34133
},
134+
"virtualNetworkNewOrExisting": {
135+
"value": "new"
136+
},
137+
"virtualNetworkName": {
138+
"value": "GEN-UNIQUE"
139+
},
140+
"virtualNetworkResourceGroupName": {
141+
"value": "GEN-UNIQUE"
142+
},
143+
"addressPrefixes": {
144+
"value": "10.0.0.0/16"
145+
},
146+
"subnetName": {
147+
"value": "GEN-UNIQUE"
148+
},
149+
"subnetPrefix":{
150+
"value": "10.0.0.0/24"
151+
},
152+
"subnetForAppGateway":{
153+
"value": "GEN-UNIQUE"
154+
},
155+
"subnetPrefixForAppGateway":{
156+
"value": "10.0.1.0/24"
157+
},
35158
"vmSize":{
36159
"value": "GEN-UNIQUE"
37160
},
161+
"vmSizeSelectForCoherence":{
162+
"value": "GEN-UNIQUE"
163+
},
38164
"numberOfInstances": {
39165
"value": "GEN-UNIQUE"
40166
},
41-
"adminVMName": {
42-
"value": "GEN-UNIQUE"
43-
},
44167
"denyPublicTrafficForAdminServer": {
45168
"value": false
46169
},
47170
"enableCustomSSL": {
48171
"value": false
172+
},
173+
"uploadedCustomIdentityKeyStoreData": {
174+
"value": "GEN-UNIQUE"
175+
},
176+
"uploadedCustomIdentityKeyStorePassphrase": {
177+
"value": "GEN-UNIQUE"
178+
},
179+
"uploadedCustomIdentityKeyStoreType": {
180+
"value": "JKS"
181+
},
182+
"uploadedCustomTrustKeyStoreData": {
183+
"value": "GEN-UNIQUE"
184+
},
185+
"uploadedCustomTrustKeyStorePassPhrase": {
186+
"value": "GEN-UNIQUE"
187+
},
188+
"uploadedCustomTrustKeyStoreType": {
189+
"value": "JKS"
190+
},
191+
"uploadedPrivateKeyAlias": {
192+
"value": "GEN-UNIQUE"
193+
},
194+
"uploadedPrivateKeyPassPhrase": {
195+
"value": "GEN-UNIQUE"
49196
}
50197
}
51198
}

0 commit comments

Comments
 (0)