diff --git a/pom.xml b/pom.xml
index 1cf52d3..c6b8774 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
com.ibm.websphere.azure
azure.websphere-traditional.singleserver
- 1.0.30
+ 1.0.31
diff --git a/src/main/arm/createUiDefinition.json b/src/main/arm/createUiDefinition.json
index 6c0c71d..e125f93 100644
--- a/src/main/arm/createUiDefinition.json
+++ b/src/main/arm/createUiDefinition.json
@@ -168,12 +168,22 @@
"Standard_B1ls",
"Standard_A0",
"Basic_A0",
- "Standard_B1s"
+ "Standard_B1s",
+ ${azure.armBased.vmSize.list}
]
},
"osPlatform": "Linux",
"count": "1"
},
+ {
+ "name": "invalidVMSizeInfo",
+ "type": "Microsoft.Common.InfoBox",
+ "visible": "[contains(steps('SingleServerConfig').vmSizeSelect,'p')]",
+ "options": {
+ "icon": "Error",
+ "text": "The VM size you selected includes the feature letter 'p', indicating it uses ARM CPUs. ARM platform is not supported. Please select a different VM size. For more information, refer to the Azure virtual machine sizes naming conventions."
+ }
+ },
{
"name": "adminUsername",
"type": "Microsoft.Common.TextBox",
@@ -182,8 +192,16 @@
"toolTip": "Use only letters and numbers.",
"constraints": {
"required": true,
- "regex": "^[a-z0-9A-Z]{1,30}$",
- "validationMessage": "The value must be 1-30 characters long and must only contain letters and numbers."
+ "validations": [
+ {
+ "regex": "^[a-z0-9A-Z]{1,30}$",
+ "message": "The value must be 1-30 characters long and must only contain letters and numbers."
+ },
+ {
+ "isValid": "[not(contains(steps('SingleServerConfig').vmSizeSelect,'p'))]",
+ "message": "ARM platform is not supported. Please select a different VM size."
+ }
+ ]
}
},
{
diff --git a/src/main/resources/azure-common.properties b/src/main/resources/azure-common.properties
index 3c9bb31..f04525d 100644
--- a/src/main/resources/azure-common.properties
+++ b/src/main/resources/azure-common.properties
@@ -59,3 +59,5 @@ azure.apiVersionForStorageFileService=2023-05-01
azure.apiVersionForStorageBlobService=2023-05-01
# Microsoft.RedHatOpenShift/openShiftClusters
azure.apiVersionForOpenShiftClusters=2023-04-01
+
+azure.armBased.vmSize.list="Standard_D2plds_v5","Standard_D4plds_v5","Standard_D8plds_v5","Standard_D16plds_v5","Standard_D32plds_v5","Standard_D48plds_v5","Standard_D64plds_v5","Standard_D2pls_v5","Standard_D4pls_v5","Standard_D8pls_v5","Standard_D16pls_v5","Standard_D32pls_v5","Standard_D48pls_v5","Standard_D64pls_v5","Standard_D2pds_v5","Standard_D4pds_v5","Standard_D8pds_v5","Standard_D16pds_v5","Standard_D32pds_v5","Standard_D48pds_v5","Standard_D64pds_v5","Standard_D2ps_v5","Standard_D4ps_v5","Standard_D8ps_v5","Standard_D16ps_v5","Standard_D32ps_v5","Standard_D48ps_v5","Standard_D64ps_v5","Standard_E2pds_v5","Standard_E4pds_v5","Standard_E8pds_v5","Standard_E16pds_v5","Standard_E20pds_v5","Standard_E32pds_v5","Standard_E2ps_v5","Standard_E4ps_v5","Standard_E8ps_v5","Standard_E16ps_v5","Standard_E20ps_v5","Standard_E32ps_v5","Standard_B2pls_v2","Standard_B2ps_v2","Standard_B2pts_v2","Standard_B4pls_v2","Standard_B4ps_v2","Standard_B8pls_v2","Standard_B8ps_v2","Standard_B16pls_v2","Standard_B16ps_v2"