From e16d616b5a922680d5ae9b7c94eedb04bdab13b5 Mon Sep 17 00:00:00 2001 From: Alin Date: Wed, 26 Aug 2026 12:40:20 +0000 Subject: [PATCH 1/2] fix(CGNSPC-3205): Azure | Allow OS disk size down to 100 GB --- .../createUiDefinition.json | 14 +++++++------- .../mainTemplate.json | 12 +++++------- .../marketplace-ha/createUiDefinition.json | 14 +++++++------- azure/templates/marketplace-ha/mainTemplate.json | 12 +++++------- .../marketplace-management/createUiDefinition.json | 14 +++++++------- .../marketplace-management/mainTemplate.json | 12 +++++------- .../marketplace-mds/createUiDefinition.json | 14 +++++++------- azure/templates/marketplace-mds/mainTemplate.json | 12 +++++------- .../marketplace-single/createUiDefinition.json | 14 +++++++------- .../templates/marketplace-single/mainTemplate.json | 12 +++++------- .../marketplace-stack-ha/createUiDefinition.json | 14 +++++++------- .../marketplace-stack-ha/mainTemplate.json | 12 +++++------- .../createUiDefinition.json | 14 +++++++------- .../marketplace-stack-management/mainTemplate.json | 12 +++++------- .../createUiDefinition.json | 14 +++++++------- .../marketplace-stack-single/mainTemplate.json | 12 +++++------- .../marketplace-vmss/createUiDefinition.json | 14 +++++++------- azure/templates/marketplace-vmss/mainTemplate.json | 12 +++++------- 18 files changed, 108 insertions(+), 126 deletions(-) diff --git a/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json b/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json index cc789faa..456f4aa1 100644 --- a/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json +++ b/azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json @@ -1255,14 +1255,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), initial disk size is 200 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995. Not relevant for R81.10 and R81.20.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" }, "visible": "[not(contains('R81.10 R81.20', steps('autoprovision').cloudGuardVersion))]" }, @@ -1547,7 +1547,7 @@ "sicKey": "[steps('autoprovision').sicKeyUi]", "bootstrapScript": "[steps('chkp-advanced').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]", "diskType": "[if(contains('R81.10' , steps('autoprovision').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]", "sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]", "hyperVGeneration": "[if(not(or(equals(steps('autoprovision').cloudGuardVersion, 'R81.10'), equals(steps('autoprovision').cloudGuardVersion, 'R81.20'), equals(steps('autoprovision').cloudGuardVersion, 'R82'))), coalesce(steps('autoprovision').hyperVGeneration, 'V1'), coalesce(steps('autoprovision').hyperVGenerationLocked, 'V1'))]", diff --git a/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json b/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json index 8e7b3eef..2a589125 100644 --- a/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json +++ b/azure/templates/marketplace-gateway-load-balancer/mainTemplate.json @@ -270,13 +270,13 @@ "description": "The IP address used to manage the VMSS instances." } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB), not relevant for R81.20 and below" + "description": "OS disk size (in GB). Must be between 100 and 3995. Not relevant for R81.10 and R81.20." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -1251,9 +1251,7 @@ "subnet1Name": "[parameters('subnet1Name')]", "storageAccountName": "[concat('bootdiag', uniqueString(variables('resourceGroup').id, deployment().name))]", "storageAccountType": "Standard_LRS", - "baseDiskSizeGB": 200, - "additionalDiskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 0, parameters('additionalDiskSizeGB'))]", - "diskSizeGB": "[add(variables('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]", + "diskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 200, parameters('diskSizeGB'))]", "vxlanParametersForR82": "kernel_parameters:\n sim:\n - sim_enable_vxlan=3\n - sim_enable_gre=3\n fw: \n - fw_enable_vxlan=1\n - fw_enable_gre=1", "cloudConfigParams":[ "[concat('installationType=\\\"', variables('installationType'), '\\\"')]", diff --git a/azure/templates/marketplace-ha/createUiDefinition.json b/azure/templates/marketplace-ha/createUiDefinition.json index b81c6ac9..6767e8e2 100644 --- a/azure/templates/marketplace-ha/createUiDefinition.json +++ b/azure/templates/marketplace-ha/createUiDefinition.json @@ -1352,14 +1352,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), initial disk size is 200 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -1951,7 +1951,7 @@ "virtualNetworkExistingRGName": "[steps('network').virtualNetwork.resourceGroup]", "bootstrapScript": "[steps('chkp-advanced').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]", "diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]", "managedSystemAssigned": "[steps('chkp-advanced').managedSystemAssigned]", "sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]", diff --git a/azure/templates/marketplace-ha/mainTemplate.json b/azure/templates/marketplace-ha/mainTemplate.json index 5ea0f0ab..510b9402 100644 --- a/azure/templates/marketplace-ha/mainTemplate.json +++ b/azure/templates/marketplace-ha/mainTemplate.json @@ -248,13 +248,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -1233,8 +1233,6 @@ "isBlink": true, "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "baseDiskSizeGB": 200, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]", "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]", "imagePublisher": "checkpoint", "imageReferenceBYOL": { @@ -1883,7 +1881,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[concat(parameters('vmName'), copyIndex(1))]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-management/createUiDefinition.json b/azure/templates/marketplace-management/createUiDefinition.json index 45911389..ac560259 100644 --- a/azure/templates/marketplace-management/createUiDefinition.json +++ b/azure/templates/marketplace-management/createUiDefinition.json @@ -660,14 +660,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), initial disk size is 200 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -1038,7 +1038,7 @@ "installationType": "[steps('chkp-advanced').installationType]", "bootstrapScript": "[steps('chkp-advanced').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]", "msi" : "[steps('chkp-advanced').identityAccessManagement]", "diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]", "sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]", diff --git a/azure/templates/marketplace-management/mainTemplate.json b/azure/templates/marketplace-management/mainTemplate.json index 0caeb565..60735c1c 100644 --- a/azure/templates/marketplace-management/mainTemplate.json +++ b/azure/templates/marketplace-management/mainTemplate.json @@ -227,13 +227,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -1147,8 +1147,6 @@ "useAZ": "[equals(parameters('availabilityZonesChoice'), 'Yes')]", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "baseDiskSizeGB": 200, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]", "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', parameters('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'enableApi=\"', parameters('enableApi'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]", "customData64": "[base64(variables('customData'))]", "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]", @@ -1774,7 +1772,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[parameters('vmName')]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-mds/createUiDefinition.json b/azure/templates/marketplace-mds/createUiDefinition.json index ddcb5b4a..1b6a0a56 100644 --- a/azure/templates/marketplace-mds/createUiDefinition.json +++ b/azure/templates/marketplace-mds/createUiDefinition.json @@ -512,14 +512,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), initial disk size is 200 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -838,7 +838,7 @@ "bootstrapScript": "[steps('chkp-advanced').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]", "msi" : "[steps('chkp-advanced').identityAccessManagement]", - "additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]", "diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]", "sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]", "availabilityZones": "[if(equals(basics('availabilityZonesChoice'), 'Yes'), parse(concat('[\"', coalesce(basics('zoneDropdown'), '1'), '\"]')), parse('[]'))]", diff --git a/azure/templates/marketplace-mds/mainTemplate.json b/azure/templates/marketplace-mds/mainTemplate.json index 9d25b53f..24a805d4 100644 --- a/azure/templates/marketplace-mds/mainTemplate.json +++ b/azure/templates/marketplace-mds/mainTemplate.json @@ -183,13 +183,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -1098,8 +1098,6 @@ "logserver": "[equals(parameters('installationType'), 'mds-logserver')]", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "baseDiskSizeGB": 200, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]", "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', parameters('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'sicKey=\"', parameters('sicKey'), '\"', '\n', 'primary=\"', variables('primary'), '\"', '\n', 'secondary=\"', variables('secondary'), '\"', '\n', 'logserver=\"', variables('logserver'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]", "customData64": "[base64(variables('customData'))]", "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]", @@ -1567,7 +1565,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[parameters('vmName')]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-single/createUiDefinition.json b/azure/templates/marketplace-single/createUiDefinition.json index 40a297bd..4091ee88 100644 --- a/azure/templates/marketplace-single/createUiDefinition.json +++ b/azure/templates/marketplace-single/createUiDefinition.json @@ -1345,14 +1345,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), initial disk size is 200 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -1772,7 +1772,7 @@ "installationType": "[steps('chkp-advanced').installationType]", "bootstrapScript": "[steps('chkp-advanced').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]", "diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]", "sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]", "hyperVGeneration": "[if(not(or(equals(steps('chkp').cloudGuardVersion, 'R81.10'), equals(steps('chkp').cloudGuardVersion, 'R81.20'), equals(steps('chkp').cloudGuardVersion, 'R82'))), coalesce(steps('chkp').hyperVGeneration, 'V1'), coalesce(steps('chkp').hyperVGenerationLocked, 'V1'))]", diff --git a/azure/templates/marketplace-single/mainTemplate.json b/azure/templates/marketplace-single/mainTemplate.json index 570b5c46..b1aa48cc 100644 --- a/azure/templates/marketplace-single/mainTemplate.json +++ b/azure/templates/marketplace-single/mainTemplate.json @@ -269,13 +269,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -1235,8 +1235,6 @@ "useAZ": "[and(equals(parameters('extendedZone'), 'None'), equals(parameters('availabilityZonesChoice'), 'Yes'))]", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "baseDiskSizeGB": 200, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]", "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'customMetrics=\"', variables('customMetrics'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'smart1CloudToken=\"', parameters('smart1CloudToken'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]", "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]", "imagePublisher": "checkpoint", @@ -1820,7 +1818,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[parameters('vmName')]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-stack-ha/createUiDefinition.json b/azure/templates/marketplace-stack-ha/createUiDefinition.json index 08494d6a..428c95c7 100644 --- a/azure/templates/marketplace-stack-ha/createUiDefinition.json +++ b/azure/templates/marketplace-stack-ha/createUiDefinition.json @@ -380,14 +380,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), Initial disk size is 100 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -506,7 +506,7 @@ "virtualNetworkExistingRGName": "[steps('network').virtualNetwork.resourceGroup]", "bootstrapScript": "[steps('chkp').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp').diskSizeGB)]", "sourceImageVhdUri": "[coalesce(steps('chkp').sourceImageVhdUri, 'noCustomUri')]" } } diff --git a/azure/templates/marketplace-stack-ha/mainTemplate.json b/azure/templates/marketplace-stack-ha/mainTemplate.json index 932a8714..7f0106a9 100755 --- a/azure/templates/marketplace-stack-ha/mainTemplate.json +++ b/azure/templates/marketplace-stack-ha/mainTemplate.json @@ -174,13 +174,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -243,8 +243,6 @@ "deploymentsApiVersion": "2016-02-01", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "diskSize100GB": 100, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('diskSize100GB'))]", "customData": "[concat('#!/usr/bin/python /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'resourceGroup=\"', resourceGroup().name, '\"', '\n', 'subscriptionId=\"', subscription().subscriptionId, '\"', '\n', 'subnet1Prefix=\"', first(split(parameters('subnet1Prefix'), '/')), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'tenantId=\"', subscription().tenantId, '\"', '\n', 'virtualNetwork=\"', parameters('virtualNetworkName'), '\"', '\n', 'clusterName=\"', parameters('vmName'), '\"', '\n')]", "imageOfferR8110": "check-point-cg-r8110", "imageOffer": "[concat(variables(concat('imageOffer', variables('osVersion'))), parameters('preview'))]", @@ -626,7 +624,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[concat(parameters('vmName'), copyIndex(1))]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-stack-management/createUiDefinition.json b/azure/templates/marketplace-stack-management/createUiDefinition.json index 3f5a84d7..b3de36b0 100644 --- a/azure/templates/marketplace-stack-management/createUiDefinition.json +++ b/azure/templates/marketplace-stack-management/createUiDefinition.json @@ -188,14 +188,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), Initial disk size is 100 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -299,7 +299,7 @@ "managementGUIClientNetwork": "[steps('chkp').managementGUIClientNetwork]", "bootstrapScript": "[steps('chkp').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp').diskSizeGB)]", "sourceImageVhdUri": "[coalesce(steps('chkp').sourceImageVhdUri, 'noCustomUri')]" } } diff --git a/azure/templates/marketplace-stack-management/mainTemplate.json b/azure/templates/marketplace-stack-management/mainTemplate.json index e8c36031..c0ff9557 100755 --- a/azure/templates/marketplace-stack-management/mainTemplate.json +++ b/azure/templates/marketplace-stack-management/mainTemplate.json @@ -151,13 +151,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -225,8 +225,6 @@ "deploymentsApiVersion": "2016-02-01", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "diskSize100GB": 100, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('diskSize100GB'))]", "customData": "[concat('#!/usr/bin/python /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'resourceGroup=\"', resourceGroup().name, '\"', '\n', 'subscriptionId=\"', subscription().subscriptionId, '\"', '\n')]", "imageOfferR8110": "check-point-cg-r8110", "imageOffer": "[concat(variables(concat('imageOffer', variables('osVersion'))), parameters('preview'))]", @@ -443,7 +441,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[parameters('vmName')]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-stack-single/createUiDefinition.json b/azure/templates/marketplace-stack-single/createUiDefinition.json index 279644a1..26c79bba 100644 --- a/azure/templates/marketplace-stack-single/createUiDefinition.json +++ b/azure/templates/marketplace-stack-single/createUiDefinition.json @@ -379,14 +379,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), Initial disk size is 100 GB.", + "label": "OS disk size (GB)", + "defaultValue": "200", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" } }, { @@ -506,7 +506,7 @@ "managementGUIClientNetwork": "[steps('chkp').managementGUIClientNetwork]", "bootstrapScript": "[steps('chkp').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp').diskSizeGB)]", "sourceImageVhdUri": "[coalesce(steps('chkp').sourceImageVhdUri, 'noCustomUri')]" } } diff --git a/azure/templates/marketplace-stack-single/mainTemplate.json b/azure/templates/marketplace-stack-single/mainTemplate.json index c33ab3e1..a29178c4 100755 --- a/azure/templates/marketplace-stack-single/mainTemplate.json +++ b/azure/templates/marketplace-stack-single/mainTemplate.json @@ -179,13 +179,13 @@ "description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point" } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 200, "metadata": { - "description": "Amount of additional disk space (in GB)" + "description": "OS disk size (in GB). Must be between 100 and 3995." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -248,8 +248,6 @@ "deploymentsApiVersion": "2016-02-01", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "diskSize100GB": 100, - "diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('diskSize100GB'))]", "customData": "[concat('#!/usr/bin/python /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'resourceGroup=\"', resourceGroup().name, '\"', '\n', 'subscriptionId=\"', subscription().subscriptionId, '\"', '\n')]", "imageOfferR8110": "check-point-cg-r8110", "imageOffer": "[concat(variables(concat('imageOffer', variables('osVersion'))), parameters('preview'))]", @@ -530,7 +528,7 @@ "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", - "diskSizeGB": "[variables('diskSizeGB')]", + "diskSizeGB": "[parameters('diskSizeGB')]", "name": "[parameters('vmName')]", "managedDisk": { "storageAccountType": "[parameters('diskType')]" diff --git a/azure/templates/marketplace-vmss/createUiDefinition.json b/azure/templates/marketplace-vmss/createUiDefinition.json index 12be8dc4..432b73af 100644 --- a/azure/templates/marketplace-vmss/createUiDefinition.json +++ b/azure/templates/marketplace-vmss/createUiDefinition.json @@ -1676,14 +1676,14 @@ } }, { - "name": "additionalDiskSizeGB", + "name": "diskSizeGB", "type": "Microsoft.Common.TextBox", - "label": "Additional disk space (GB)", - "defaultValue": "0", - "toolTip": "Additional disk space (in GB), initial disk size is 200 GB.", + "label": "OS disk size (GB)", + "defaultValue": "100", + "toolTip": "OS disk size (in GB). Must be between 100 and 3995. Not relevant for R81.10 and R81.20.", "constraints": { - "regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$", - "validationMessage": "Select a number between 0 and 3995" + "regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$", + "validationMessage": "Select a number between 100 and 3995" }, "visible": "[not(contains('R81.10 R81.20', steps('autoprovision').cloudGuardVersion))]" }, @@ -2060,7 +2060,7 @@ "sicKey": "[steps('autoprovision').sicKeyUi]", "bootstrapScript": "[steps('chkp-advanced').bootstrapScript]", "allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]", - "additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]", + "diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]", "diskType": "[if(contains('R81.10' , steps('autoprovision').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]", "sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]", "hyperVGeneration": "[if(not(or(equals(steps('autoprovision').cloudGuardVersion, 'R81.10'), equals(steps('autoprovision').cloudGuardVersion, 'R81.20'), equals(steps('autoprovision').cloudGuardVersion, 'R82'))), coalesce(steps('autoprovision').hyperVGeneration, 'V1'), coalesce(steps('autoprovision').hyperVGenerationLocked, 'V1'))]", diff --git a/azure/templates/marketplace-vmss/mainTemplate.json b/azure/templates/marketplace-vmss/mainTemplate.json index e38aecfb..889662f0 100644 --- a/azure/templates/marketplace-vmss/mainTemplate.json +++ b/azure/templates/marketplace-vmss/mainTemplate.json @@ -399,13 +399,13 @@ "description": "The IP address used to manage the VMSS instances." } }, - "additionalDiskSizeGB": { + "diskSizeGB": { "type": "int", - "defaultValue": 0, + "defaultValue": 100, "metadata": { - "description": "Amount of additional disk space (in GB), not relevant for R81.20 and below" + "description": "OS disk size (in GB). Must be between 100 and 3995. Not relevant for R81.10 and R81.20." }, - "minValue": 0, + "minValue": 100, "maxValue": 3995 }, "diskType": { @@ -1392,9 +1392,7 @@ "subnet2Name": "[parameters('subnet2Name')]", "storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]", "storageAccountType": "Standard_LRS", - "baseDiskSizeGB": 200, - "additionalDiskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 0, parameters('additionalDiskSizeGB'))]", - "diskSizeGB": "[add(variables('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]", + "diskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 200, parameters('diskSizeGB'))]", "enableFloatingIP": "[equals(parameters('floatingIP'), 'yes')]", "customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'customMetrics=\"', variables('customMetrics'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]", "imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]", From e03d3a59e3eacc365ec4f5ddf0eac57732a8e8bb Mon Sep 17 00:00:00 2001 From: Alin Date: Wed, 26 Aug 2026 14:08:46 +0000 Subject: [PATCH 2/2] feat(CGNSPC-3876): Update vWAN plan version --- azure/templates/vwan-managed-app/mainTemplate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/templates/vwan-managed-app/mainTemplate.json b/azure/templates/vwan-managed-app/mainTemplate.json index 49e775d2..e43a804b 100644 --- a/azure/templates/vwan-managed-app/mainTemplate.json +++ b/azure/templates/vwan-managed-app/mainTemplate.json @@ -227,9 +227,9 @@ }, "planVersion": { "type": "string", - "defaultValue": "1.0.28", + "defaultValue": "1.0.29", "metadata": { - "description": "Always deploy the latest available version of the managed application (e.g., 1.0.27) to ensure optimal performance and compatibility. For a complete list of available versions, refer to: https://support.checkpoint.com/results/sk/sk132192" + "description": "Always deploy the latest available version of the managed application (e.g., 1.0.29) to ensure optimal performance and compatibility. For a complete list of available versions, refer to: https://support.checkpoint.com/results/sk/sk132192" } } },