Skip to content

Commit f099392

Browse files
authored
Support redeployment in the same resource group and remove external key vault integration (#342)
* remove elk and aad from templates and scripts. * remove elk and aad from test pipelines. * remove keyvault inputs from UI. * remove external key vault. * fix arm-ttk errors * add a unique suffix to resource name. * update default virtual network name to include a unique identifier * prefix NIC and IP names with an underscore for consistency * add addressPrefixes and subnetPrefix to parameters script * update domainNameLabel construction for improved uniqueness in IP DNS settings * update pipeline. * add artifact path to download step in workflow * truncate domainNameLabel to 61 characters for consistency in DNS settings * update deployment workflow to include dependency deployment in job requirements * truncate domainNameLabel to 61 characters for consistency in DNS settings across templates * do not deploy ohs in integration test. * update workflow to add self-signed certificate generation for ohs. * correct self-signed certificate generation script parameter handling * move script location. * bump version for arm-oraclelinux-wls-dynamic-cluster to 1.0.54 * add nsgName parameter to mainTemplate and ohsNestedTemplate for network security group configuration * use JKS certificate for ohs. * update Java version to 11 and change keystore type to PKCS12 * update keystore file types to PKCS12 and adjust comments for JDK 11 compatibility * change keystore type from PKCS12 to JKS in deployment scripts * update generate-selfsigned-keystore.sh to clarify JDK version and keystore type * update managedServerVMNamePrefix to append 'VM' suffix in mainTemplate.json * add verification step for WebLogic Cafe deployment and script to check accessibility * add managedVMNamePrefix parameter to dbTemplate.json * add enableCustomSSL parameter to createUiDefinition.json * add error handling for cluster shutdown in createCoherenceClusterModel function * fix shutdown function to use clientClusterName in createCoherenceClusterModel * add managedVMNamePrefix parameter to _pswlessDbTemplate.json * update self-signed certificate generation to use wildcard domain name for Azure * add managedVMNamePrefix parameter to dbTemplate.json * update mainTemplate.json to use custom identity key store parameters * add _globalResourceNameSuffix parameter to mainTemplate.json and nested DNS zone templates * update arm-oraclelinux-wls-cluster version to 1.0.730000 * update GitHub Actions workflows to use azure-javaee/weblogic-on-azure repository * refactor DNS domainNameLabel construction in ARM templates for consistency * reduce domainNameLabel length in ARM templates for DNS settings * update domainNameLabel construction in coherenceTemplate.json for clarity
1 parent 102482c commit f099392

Some content is hidden

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

45 files changed

+728
-5303
lines changed

.github/workflows/testWlsVmCluster.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ jobs:
362362
id: checkout-webapp
363363
uses: actions/checkout@v2
364364
with:
365-
repository: microsoft/weblogic-on-azure
365+
repository: azure-javaee/weblogic-on-azure
366366
path: weblogic-on-azure
367367

368368
- name: Maven build the web app

.github/workflows/testWlsVmDynamicCluster.yml

Lines changed: 131 additions & 417 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
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.720000</version.arm-oraclelinux-wls-cluster>
48-
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
47+
<version.arm-oraclelinux-wls-cluster>1.0.730000</version.arm-oraclelinux-wls-cluster>
48+
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.54</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>
5151
<version.arm-oraclelinux-wls-dynamic-cluster-addnode-coherence>1.0.3</version.arm-oraclelinux-wls-dynamic-cluster-addnode-coherence>

weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@
588588
"properties": {
589589
"publicIPAllocationMethod": "[variables('const_publicIPAddressType')]",
590590
"dnsSettings": {
591-
"domainNameLabel": "[concat(toLower(parameters('dnsLabelPrefix')),copyindex(),'-',parameters('_globalResourceNameSuffix'),'-',toLower(parameters('wlsDomainName')))]"
591+
"domainNameLabel": "[take(concat(toLower(parameters('dnsLabelPrefix')), copyindex(),'-', parameters('_globalResourceNameSuffix'),'-',toLower(parameters('wlsDomainName'))), 50)]"
592592
}
593593
},
594594
"dependsOn": [

weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
"properties": {
518518
"publicIPAllocationMethod": "[variables('const_publicIPAddressType')]",
519519
"dnsSettings": {
520-
"domainNameLabel": "[concat(toLower(parameters('dnsLabelPrefix')),copyindex(),'-',parameters('_globalResourceNameSuffix'),'-',toLower(parameters('wlsDomainName')))]"
520+
"domainNameLabel": "[take(concat(toLower(parameters('dnsLabelPrefix')), copyindex(),'-', parameters('_globalResourceNameSuffix'),'-',toLower(parameters('wlsDomainName'))), 50)]"
521521
}
522522
},
523523
"dependsOn": [

weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
"properties": {
356356
"publicIPAllocationMethod": "[variables('const_publicIPAddressType')]",
357357
"dnsSettings": {
358-
"domainNameLabel": "[concat(toLower(parameters('dnsLabelPrefix')),'-',toLower(variables('name_vmPrefix')),copyindex(1),'-',parameters('_globalResourceNameSuffix'),'-',toLower(parameters('wlsDomainName')))]"
358+
"domainNameLabel": "[take(concat(toLower(parameters('dnsLabelPrefix')), 'co', copyindex(),'-', parameters('_globalResourceNameSuffix'),'-',toLower(parameters('wlsDomainName'))), 50)]"
359359
}
360360
}
361361
},

weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@
240240
"managedServerPrefix": {
241241
"value": "[parameters('managedServerPrefix')]"
242242
},
243+
"managedVMNamePrefix": {
244+
"value": "[parameters('managedVMNamePrefix')]"
245+
},
243246
"numberOfManagedApplicationInstances": {
244247
"value": "[parameters('numberOfManagedApplicationInstances')]"
245248
},

weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json

Lines changed: 8 additions & 353 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)