Skip to content

Commit e4bedff

Browse files
committed
modify UI and templates in cluster offer
1 parent 989d05a commit e4bedff

25 files changed

+516
-86
lines changed

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.29</version.arm-oraclelinux-wls>
4646
<version.arm-oraclelinux-wls-admin>1.0.53</version.arm-oraclelinux-wls-admin>
47-
<version.arm-oraclelinux-wls-cluster>1.0.680000</version.arm-oraclelinux-wls-cluster>
47+
<version.arm-oraclelinux-wls-cluster>1.0.700000</version.arm-oraclelinux-wls-cluster>
4848
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.51</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>

resources/azure-common.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ azure.cli.version=2.53.0
5151
azure.powershell.version=11.5
5252

5353
# used to filter tags for resources
54+
identifier.applicationGateways=Microsoft.Network/applicationGateways
55+
identifier.availabilitySets=Microsoft.Compute/availabilitySets
5456
identifier.dnszones=Microsoft.Network/dnszones
5557
identifier.networkInterfaces=Microsoft.Network/networkInterfaces
5658
identifier.networkSecurityGroups=Microsoft.Network/networkSecurityGroups

resources/doc/guidance-for-tagging-resource.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ For example, in the UI definition, customers can specify tags for `Microsoft.Key
4545
- Microsoft.Resources/deploymentScripts
4646
- Microsoft.ManagedIdentity/userAssignedIdentities
4747
- Microsoft.Resources/deployments
48+
- Microsoft.Network/applicationGateways
4849

4950
### Resources that Do Not Support Tags:
5051

@@ -53,7 +54,16 @@ For example, in the UI definition, customers can specify tags for `Microsoft.Key
5354
- Microsoft.Network/networkSecurityGroups/securityRules
5455
- Microsoft.Network/dnsZones/A
5556
- Microsoft.Network/dnszones/CNAME
57+
- Microsoft.Network/virtualNetworks/subnets
5658
- Microsoft.Authorization/roleAssignments
59+
- Microsoft.Network/loadBalancers/backendAddressPools
60+
- Microsoft.Network/applicationGateways/backendHttpSettingsCollection
61+
- Microsoft.Network/applicationGateways/frontendIPConfigurations
62+
- Microsoft.Network/applicationGateways/frontendPorts
63+
- Microsoft.Network/applicationGateways/gatewayIPConfigurations
64+
- Microsoft.Network/applicationGateways/httpListeners
65+
- Microsoft.Network/applicationGateways/probes
66+
- Microsoft.Network/applicationGateways/requestRoutingRules
5767

5868
## Step 2: Tag UI Control
5969

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,34 @@
16491649
"visible": "[bool(steps('section_coherence').enableCoherence)]"
16501650
}
16511651
]
1652+
},
1653+
{
1654+
"name": "section_tags",
1655+
"label": "Tags",
1656+
"elements": [
1657+
{
1658+
"name": "tagsByResource",
1659+
"type": "Microsoft.Common.TagsByResource",
1660+
"resources": [
1661+
"${identifier.applicationGateways}",
1662+
"${identifier.virtualMachines}",
1663+
"${identifier.virtualMachinesExtensions}",
1664+
"${identifier.publicIPAddresses}",
1665+
"${identifier.availabilitySets}",
1666+
"${identifier.vaults}",
1667+
"${identifier.userAssignedIdentities}",
1668+
"${identifier.dnszones}",
1669+
"${identifier.networkInterfaces}",
1670+
"${identifier.networkSecurityGroups}",
1671+
"${identifier.privateEndpoints}",
1672+
"${identifier.virtualNetworks}",
1673+
"${identifier.deploymentScripts}",
1674+
"${identifier.storageAccounts}",
1675+
"${identifier.resourcesDeployment}"
1676+
],
1677+
"toolTip": "Tags help you organize your resources and categorize them for billing or management purposes. You can apply tags to resources deployed by the offer."
1678+
}
1679+
]
16521680
}
16531681
],
16541682
"outputs": {
@@ -1724,7 +1752,8 @@
17241752
"uploadedPrivateKeyPassPhrase": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyPassPhrase]",
17251753
"virtualNetworkName": "[if(steps('section_appGateway').enableAppGateway, steps('section_networkingConfiguration').virtualNetworkWithAppGateway.name, steps('section_networkingConfiguration').virtualNetworkWithoutAppGateway.name)]",
17261754
"virtualNetworkResourceGroupName": "[if(steps('section_appGateway').enableAppGateway, steps('section_networkingConfiguration').virtualNetworkWithAppGateway.resourceGroup, steps('section_networkingConfiguration').virtualNetworkWithoutAppGateway.resourceGroup)]",
1727-
"virtualNetworkNewOrExisting": "[if(steps('section_appGateway').enableAppGateway, steps('section_networkingConfiguration').virtualNetworkWithAppGateway.newOrExisting, steps('section_networkingConfiguration').virtualNetworkWithoutAppGateway.newOrExisting)]"
1755+
"virtualNetworkNewOrExisting": "[if(steps('section_appGateway').enableAppGateway, steps('section_networkingConfiguration').virtualNetworkWithAppGateway.newOrExisting, steps('section_networkingConfiguration').virtualNetworkWithoutAppGateway.newOrExisting)]",
1756+
"tagsByResource": "[steps('section_tags').tagsByResource]"
17281757
}
17291758
}
17301759
}

0 commit comments

Comments
 (0)