Skip to content
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

Azure | remove R80.40 + R81 support #396

Merged
merged 4 commits into from
Jul 24, 2024
Merged

Azure | remove R80.40 + R81 support #396

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
dc6f6d3
Azure | remove R8040+R81 support
chkp-rivkas Jul 21, 2024
5e36655
update deprecated/azure/templates
chkp-rivkas Jul 21, 2024
b8f099b
revert pid
chkp-rivkas Jul 23, 2024
3f37b13
remove redundant //
chkp-rivkas Jul 23, 2024
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
18 changes: 9 additions & 9 deletions azure/templates/marketplace-gateway-load-balancer/createUiDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@
}
},
{
"visible": "[bool(basics('auth').sshPublicKey)]",
"visible": "[bool(basics('auth').sshPublicKey)]",
"name": "EnableSerialConsolePassword",
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable Serial console password",
Expand Down Expand Up @@ -1160,14 +1160,14 @@
{
"name": "MaintenanceModeInfoBox",
"type": "Microsoft.Common.InfoBox",
"visible": "[and(bool(basics('auth').password), not(contains('R80.40 R81 R81.10', steps('chkp').cloudGuardVersion)))]",
"visible": "[and(bool(basics('auth').password), not(contains('R81.10', steps('chkp').cloudGuardVersion)))]",
"options": {
"icon": "Info",
"text": "Check Point recommends setting a maintenance-mode password for recovery purposes."
}
},
{
"visible": "[not(contains('R80.40 R81 R81.10', steps('chkp').cloudGuardVersion))]",
"visible": "[not(contains('R81.10', steps('chkp').cloudGuardVersion))]",
"name": "EnableMaintenanceMode",
"type": "Microsoft.Common.OptionsGroup",
"label": "Enable Maintenance Mode",
Expand All @@ -1187,7 +1187,7 @@
}
},
{
"visible": "[and(not(contains('R80.40 R81 R81.10', steps('chkp').cloudGuardVersion)), steps('chkp').EnableMaintenanceMode)]",
"visible": "[and(not(contains('R81.10', steps('chkp').cloudGuardVersion)), steps('chkp').EnableMaintenanceMode)]",
"name": "MaintenanceModePassword",
"type": "Microsoft.Common.PasswordBox",
"defaultValue": "",
Expand Down Expand Up @@ -1244,7 +1244,7 @@
"type": "Microsoft.Common.OptionsGroup",
"label": "VM disk type",
"toolTip": "Type of CloudGuard disk.",
"visible": "[not(contains('R80.40 R81 R81.10' , steps('chkp').cloudGuardVersion))]",
"visible": "[not(contains('R81.10' , steps('chkp').cloudGuardVersion))]",
"defaultValue": "Premium",
"constraints": {
"allowedValues": [
Expand All @@ -1264,7 +1264,7 @@
"type": "Microsoft.Common.OptionsGroup",
"label": "VM disk type",
"toolTip": "Type of CloudGuard disk.",
"visible": "[contains('R80.40 R81 R81.10' , steps('chkp').cloudGuardVersion)]",
"visible": "[contains('R81.10' , steps('chkp').cloudGuardVersion)]",
"defaultValue": "Standard",
"constraints": {
"allowedValues": [
Expand All @@ -1289,7 +1289,7 @@
"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"
},
"visible": "[not(contains('R80.40 R81 R81.10 R81.20', steps('chkp').cloudGuardVersion))]"
"visible": "[not(contains('R81.10 R81.20', steps('chkp').cloudGuardVersion))]"
},
{
"name": "useCustomImageUri",
Expand Down Expand Up @@ -1494,7 +1494,7 @@
"bootstrapScript": "[steps('chkp').bootstrapScript]",
"allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp').allowUploadDownload, 'true')]",
"additionalDiskSizeGB": "[int(steps('chkp').additionalDiskSizeGB)]",
"diskType": "[if(contains('R80.40 R81 R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp').VMDiskTypeOldVersions , steps('chkp').VMDiskType)]",
"diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp').VMDiskTypeOldVersions , steps('chkp').VMDiskType)]",
"sourceImageVhdUri": "[coalesce(steps('chkp').sourceImageVhdUri, 'noCustomUri')]",
"virtualNetworkName": "[steps('network').virtualNetwork.name]",
"virtualNetworkAddressPrefix": "[steps('network').virtualNetwork.addressPrefix]",
Expand All @@ -1513,4 +1513,4 @@
"MaintenanceModePasswordHash": "[steps('chkp').MaintenanceModePassword]"
}
}
}
}
261 changes: 206 additions & 55 deletions azure/templates/marketplace-gateway-load-balancer/mainTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,20 +401,20 @@
"metadata": {
"description": "Add Storage Account IP rules that allow access to the Serial Console only for IPs based on their geographic location, based on https://learn.microsoft.com/en-us/troubleshoot/azure/virtual-machines/serial-console-linux#use-serial-console-with-custom-boot-diagnostics-storage-account-firewall-enabled"
},
"defaultValue" : false
"defaultValue": false
},
"storageAccountAdditionalIps":{
"storageAccountAdditionalIps": {
"type": "array",
"metadata": {
"description": "IPs/CIDRs that are allowed access to the Storage Account"
},
"defaultValue" : []
"defaultValue": []
}
},
"variables": {
"resourceGroup": "[resourceGroup()]",
"templateName": "gwlb",
"templateVersion": "20230910",
"templateVersion": "20240716",
"location": "[parameters('location')]",
"offers": {
"R81.10 - Bring Your Own License": "BYOL",
Expand All @@ -435,58 +435,209 @@
},
"osVersion": "[variables('osVersions')[parameters('cloudGuardVersion')]]",
"SerialConsoleGeographies": {
"eastasia" : ["20.205.69.28", "20.195.85.180"],
"southeastasia" : ["20.205.69.28", "20.195.85.180"],
"australiacentral" : ["20.53.53.224", "20.70.222.112"],
"australiacentral2" : ["20.53.53.224", "20.70.222.112"],
"australiaeast" : ["20.53.53.224", "20.70.222.112"],
"australiasoutheast" : ["20.53.53.224", "20.70.222.112"],
"brazilsouth" : ["91.234.136.63", "20.206.0.194"],
"brazilsoutheast" : ["91.234.136.63", "20.206.0.194"],
"canadacentral" : ["52.228.86.177", "52.242.40.90"],
"canadaeast" : ["52.228.86.177", "52.242.40.90"],
"northeurope" : ["52.146.139.220", "20.105.209.72"],
"westeurope" : ["52.146.139.220", "20.105.209.72"],
"francecentral" : ["20.111.0.244", "52.136.191.10"],
"francesouth" : ["20.111.0.244", "52.136.191.10"],
"germanynorth" : ["51.116.75.88", "20.52.95.48"],
"germanywestcentral" : ["51.116.75.88", "20.52.95.48"],
"centralindia" : ["20.192.168.150", "20.192.153.104"],
"southindia" : ["20.192.168.150", "20.192.153.104"],
"westindia" : ["20.192.168.150", "20.192.153.104"],
"japaneast" : ["20.43.70.205", "20.189.228.222"],
"japanwest" : ["20.43.70.205", "20.189.228.222"],
"koreacentral" : ["20.200.196.96", "52.147.119.29"],
"koreasouth" : ["20.200.196.96", "52.147.119.29"],
"norwaywest" : ["20.100.1.184", "51.13.138.76"],
"norwayeast" : ["20.100.1.184", "51.13.138.76"],
"switzerlandnorth" : ["20.208.4.98", "51.107.251.190"],
"switzerlandwest" : ["20.208.4.98", "51.107.251.190"],
"uaecentral" : ["20.45.95.66", "20.38.141.5"],
"uaenorth" : ["20.45.95.66", "20.38.141.5"],
"uksouth" : ["20.90.132.144", "20.58.68.62"],
"ukwest" : ["20.90.132.144", "20.58.68.62"],
"swedencentral" : ["51.12.72.223", "51.12.22.174"],
"swedensouth" : ["51.12.72.223", "51.12.22.174"],
"centralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"eastus2" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"eastus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"northcentralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"southcentralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"westus2" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"westus3" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"westcentralus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"westus" : ["20.98.146.84", "20.98.194.64", "20.69.5.162", "20.83.222.102"],
"eastus2euap" : ["20.45.242.18", "20.51.21.252"],
"centraluseuap" : ["20.45.242.18", "20.51.21.252"]},
"eastasia": [
"20.205.69.28",
"20.195.85.180"
],
"southeastasia": [
"20.205.69.28",
"20.195.85.180"
],
"australiacentral": [
"20.53.53.224",
"20.70.222.112"
],
"australiacentral2": [
"20.53.53.224",
"20.70.222.112"
],
"australiaeast": [
"20.53.53.224",
"20.70.222.112"
],
"australiasoutheast": [
"20.53.53.224",
"20.70.222.112"
],
"brazilsouth": [
"91.234.136.63",
"20.206.0.194"
],
"brazilsoutheast": [
"91.234.136.63",
"20.206.0.194"
],
"canadacentral": [
"52.228.86.177",
"52.242.40.90"
],
"canadaeast": [
"52.228.86.177",
"52.242.40.90"
],
"northeurope": [
"52.146.139.220",
"20.105.209.72"
],
"westeurope": [
"52.146.139.220",
"20.105.209.72"
],
"francecentral": [
"20.111.0.244",
"52.136.191.10"
],
"francesouth": [
"20.111.0.244",
"52.136.191.10"
],
"germanynorth": [
"51.116.75.88",
"20.52.95.48"
],
"germanywestcentral": [
"51.116.75.88",
"20.52.95.48"
],
"centralindia": [
"20.192.168.150",
"20.192.153.104"
],
"southindia": [
"20.192.168.150",
"20.192.153.104"
],
"westindia": [
"20.192.168.150",
"20.192.153.104"
],
"japaneast": [
"20.43.70.205",
"20.189.228.222"
],
"japanwest": [
"20.43.70.205",
"20.189.228.222"
],
"koreacentral": [
"20.200.196.96",
"52.147.119.29"
],
"koreasouth": [
"20.200.196.96",
"52.147.119.29"
],
"norwaywest": [
"20.100.1.184",
"51.13.138.76"
],
"norwayeast": [
"20.100.1.184",
"51.13.138.76"
],
"switzerlandnorth": [
"20.208.4.98",
"51.107.251.190"
],
"switzerlandwest": [
"20.208.4.98",
"51.107.251.190"
],
"uaecentral": [
"20.45.95.66",
"20.38.141.5"
],
"uaenorth": [
"20.45.95.66",
"20.38.141.5"
],
"uksouth": [
"20.90.132.144",
"20.58.68.62"
],
"ukwest": [
"20.90.132.144",
"20.58.68.62"
],
"swedencentral": [
"51.12.72.223",
"51.12.22.174"
],
"swedensouth": [
"51.12.72.223",
"51.12.22.174"
],
"centralus": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"eastus2": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"eastus": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"northcentralus": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"southcentralus": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"westus2": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"westus3": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"westcentralus": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"westus": [
"20.98.146.84",
"20.98.194.64",
"20.69.5.162",
"20.83.222.102"
],
"eastus2euap": [
"20.45.242.18",
"20.51.21.252"
],
"centraluseuap": [
"20.45.242.18",
"20.51.21.252"
]
},
"serialConsoleIps": "[if(contains(variables('serialConsoleGeographies'),variables('location')),variables('serialConsoleGeographies')[variables('location')],createArray())]",
"storageAccountIps" : "[concat(variables('SerialConsoleIps'),parameters('storageAccountAdditionalIps'))]",
"storageAccountIps": "[concat(variables('SerialConsoleIps'),parameters('storageAccountAdditionalIps'))]",
"isBlink": true,
"subnet1Name": "[parameters('subnet1Name')]",
"storageAccountName": "[concat('bootdiag', uniqueString(variables('resourceGroup').id, deployment().name))]",
"storageAccountType": "Standard_LRS",
"diskSize100GB": 100,
"additionalDiskSizeGB": "[if(contains('R8040 R81 R8110 R8120', variables('osVersion')), 0, parameters('additionalDiskSizeGB'))]",
"additionalDiskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 0, parameters('additionalDiskSizeGB'))]",
"diskSizeGB": "[add(variables('additionalDiskSizeGB'), variables('diskSize100GB'))]",
"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')))]",
Expand Down Expand Up @@ -640,7 +791,9 @@
"customMetrics": "[parameters('customMetrics')]",
"monitoringMetricsPublisher": "[concat('/subscriptions/', parameters('subscriptionId'), '/providers/Microsoft.Authorization/roleDefinitions/', '3913510d-42f4-4e42-8a64-420c390055eb')]",
"identity": "[json('{\"type\": \"SystemAssigned\"}')]",
"NewNsgReference": {"id": "[resourceId(variables('vnetRGName'),'Microsoft.Network/networkSecurityGroups', parameters('NewNsgName'))]"}
"NewNsgReference": {
"id": "[resourceId(variables('vnetRGName'),'Microsoft.Network/networkSecurityGroups', parameters('NewNsgName'))]"
}
},
"resources": [
{
Expand Down Expand Up @@ -705,8 +858,7 @@
"deployNsg": {
"value": "[parameters('deployNewNSG')]"
},
"NewNsgName":
{
"NewNsgName": {
"value": "[parameters('NewNsgName')]"
},
"deployRouteTable": {
Expand Down Expand Up @@ -749,8 +901,7 @@
"deployNsg": {
"value": "[parameters('deployNewNSG')]"
},
"NewNsgName":
{
"NewNsgName": {
"value": "[parameters('NewNsgName')]"
},
"tagsByResource": {
Expand Down
Loading
Loading