Skip to content

Support re-deployment in the same resource group for single node offer #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 19, 2025
Merged

Support re-deployment in the same resource group for single node offer #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5fa6fd
add global unique suffix to resource name.
galiacheng Feb 11, 2025
7a6b787
update API version for azure.apiVersionForStorage.
galiacheng Feb 11, 2025
44ef1ff
use unique vm name.
galiacheng Feb 11, 2025
0ab0eb7
increase pom.
galiacheng Feb 11, 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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<!-- weblogic azure aks versions -->
<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.30</version.arm-oraclelinux-wls>
<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-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
Expand Down
4 changes: 2 additions & 2 deletions resources/azure-common.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ azure.apiVersionForDeployment=2023-07-01
# Microsoft.Resources/tags
azure.apiVersionForTags=2023-07-01
# Microsoft.Storage/storageAccounts
azure.apiVersionForStorage=2023-01-01
azure.apiVersionForStorage=2023-05-01
# Microsoft.Storage/storageAccounts/fileServices
azure.apiVersionForStorageFileService=2023-01-01
azure.apiVersionForStorageFileService=2023-05-01
# Microsoft.Monitor/accounts
azure.apiVersionForMonitorAccount=2023-04-03

Expand Down
50 changes: 26 additions & 24 deletions weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
},
"variables": {
"const_addressPrefix": "10.0.0.0/16",
"const_globalResourceNameSuffix": "[uniqueString(parameters('guidValue'))]",
"const_hyphen": "-",
"const_imageOffer": "[concat('weblogic',variables('const_hyphen'), split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[1],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[2],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[3],if(parameters('usePreviewImage'),'-preview',''))]",
"const_imagePublisher": "oracle",
Expand All @@ -133,12 +134,13 @@
"const_vmSize": "[parameters('vmSize')]",
"name_linuxImageOfferSKU": "[first(split(parameters('skuUrnVersion'), ';'))]",
"name_linuxImageVersion": "[last(split(parameters('skuUrnVersion'),';'))]",
"name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg')]",
"name_nic": "olvm_NIC",
"name_publicIPAddress": "olvm_PublicIP",
"name_storageAccount": "[concat(take(replace(parameters('guidValue'),'-',''),6),'olvm')]",
"name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg_', variables('const_globalResourceNameSuffix'))]",
"name_nic": "[concat('olvm_NIC_', variables('const_globalResourceNameSuffix'))]",
"name_publicIPAddress": "[concat('olvm_PublicIP_', variables('const_globalResourceNameSuffix'))]",
"name_storageAccount": "[concat('olvmstg', variables('const_globalResourceNameSuffix'))]",
"name_subnet": "Subnet",
"name_virtualNetwork": "olvm_VNET",
"name_virtualNetwork": "[concat('olvm_VNET_', variables('const_globalResourceNameSuffix'))]",
"name_vmName": "[concat(parameters('vmName'), variables('const_globalResourceNameSuffix'))]",
"ref_networkSecurityGroup": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('name_networkSecurityGroup'))]",
"ref_subnet": "[resourceId('Microsoft.Network/virtualNetworks/subnets', variables('name_virtualNetwork'), variables('name_subnet'))]"
},
Expand Down Expand Up @@ -285,15 +287,15 @@
}
],
"dnsSettings": {
"internalDnsNameLabel": "[parameters('vmName')]"
"internalDnsNameLabel": "[variables('name_vmName')]"
}
}
},
{
"apiVersion": "${azure.apiVersionForVirtualMachines}",
"type": "Microsoft.Compute/virtualMachines",
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]",
"name": "[parameters('vmName')]",
"name": "[variables('name_vmName')]",
"location": "[parameters('location')]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount'))]",
Expand All @@ -305,7 +307,7 @@
"vmSize": "[variables('const_vmSize')]"
},
"osProfile": {
"computerName": "[parameters('vmName')]",
"computerName": "[variables('name_vmName')]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPasswordOrKey')]",
"linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('const_linuxConfiguration'))]"
Expand Down Expand Up @@ -350,7 +352,7 @@
"type": "Microsoft.Resources/deployments",
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -368,7 +370,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -387,7 +389,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -406,7 +408,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -425,7 +427,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -444,7 +446,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -463,7 +465,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -482,7 +484,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -501,7 +503,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -520,7 +522,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -539,7 +541,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -558,7 +560,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -577,7 +579,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -596,7 +598,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -615,7 +617,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand All @@ -634,7 +636,7 @@
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]",
"dependsOn": [
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
],
"properties": {
"mode": "Incremental",
Expand Down