Skip to content

feat(CGNSPC-1351): Azure | ARM | Default Management and MDS deployments to Blink image #600

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

Open
cgns-gitlab-mirror-app wants to merge 1 commit into
base: master
Choose a base branch
from
+219 −16
Open

feat(CGNSPC-1351): Azure | ARM | Default Management and MDS deployments to Blink image #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 34 additions & 4 deletions azure/templates/marketplace-management/mainTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,13 @@
"description": "The URI of the blob containing the development image"
}
},
"useBlinkImage": {
"type": "bool",
"defaultValue": true,
"metadata": {
"description": "Use the Blink image for accelerated deployment. Applicable for R81.20 and above"
}
},
"availabilityZones": {
"type": "array",
"defaultValue": [],
Expand Down Expand Up @@ -370,6 +377,7 @@
"R82.10 - Pay As You Go (MGMT25)": "R8210"
},
"osVersion": "[variables('osVersions')[parameters('cloudGuardVersion')]]",
"blinkVersionSupported": "[not(equals(variables('osVersion'), 'R8110'))]",
"serialConsoleGeographies": {
"eastasia": [
"4.145.74.168",
Expand Down Expand Up @@ -1142,8 +1150,8 @@
]
},
"serialConsoleIps": "[if(contains(variables('serialConsoleGeographies'),variables('location')),variables('serialConsoleGeographies')[variables('location')],createArray())]",
"storageAccountIps": "[concat(variables('SerialConsoleIps'),parameters('storageAccountAdditionalIps'))]",
"isBlink": "[bool('false')]",
"storageAccountIps": "[concat(variables('serialConsoleIps'),parameters('storageAccountAdditionalIps'))]",
"isBlink": "[and(parameters('useBlinkImage'), equals(parameters('installationType'), 'management'), variables('blinkVersionSupported'))]",
"useAZ": "[equals(parameters('availabilityZonesChoice'), 'Yes')]",
"storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]",
"storageAccountType": "Standard_LRS",
Expand All @@ -1163,7 +1171,19 @@
"sku": "mgmt-25",
"version": "latest"
},
"imageReferenceMarketplace": "[if(equals(variables('offer'), 'BYOL'), variables('imageReferenceBYOL'), variables('imageReferenceMGMT25'))]",
"imageReferenceBYOLBlink": {
"offer": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]",
"sku": "mgmt-byol-blink",
"version": "latest"
},
"imageReferenceMGMT25Blink": {
"offer": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]",
"sku": "mgmt-25-blink",
"version": "latest"
},
"imageReferenceMarketplace": "[if(variables('isBlink'), if(equals(variables('offer'), 'BYOL'), variables('imageReferenceBYOLBlink'), variables('imageReferenceMGMT25Blink')), if(equals(variables('offer'), 'BYOL'), variables('imageReferenceBYOL'), variables('imageReferenceMGMT25')))]",
"customImage": "customImage",
"imageReferenceCustomUri": {
"id": "[resourceId('Microsoft.Compute/images/', variables('customImage'))]"
Expand Down Expand Up @@ -1195,7 +1215,17 @@
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"plan": "[if(equals(variables('offer'), 'BYOL'), variables('planBYOL'), variables('planMGMT25'))]",
"planBYOLBlink": {
"name": "mgmt-byol-blink",
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"planMGMT25Blink": {
"name": "mgmt-25-blink",
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"plan": "[if(variables('isBlink'), if(equals(variables('offer'), 'BYOL'), variables('planBYOLBlink'), variables('planMGMT25Blink')), if(equals(variables('offer'), 'BYOL'), variables('planBYOL'), variables('planMGMT25')))]",
"identity": "[if(parameters('msi'), json('{\"type\": \"SystemAssigned\"}'), json('null'))]",
"publicIPAddressName": "[parameters('vmName')]",
"publicIPAddressId": "[resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName'))]",
Expand Down
130 changes: 125 additions & 5 deletions azure/templates/marketplace-mds/createUiDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,17 @@
"type": "Microsoft.Common.DropDown",
"label": "License type",
"toolTip": "The type of license.",
"defaultValue": "Bring Your Own License",
"defaultValue": "Pay As You Go (MDS25)",
"visible": true,
"constraints": {
"allowedValues": [
{
"label": "Bring Your Own License",
"value": "Bring Your Own License"
},
{
"label": "Pay As You Go (MDS25)",
"value": "Pay As You Go (MDS25)"
}
]
}
Expand Down Expand Up @@ -186,6 +190,35 @@
},
"count": 1
},
{
"name": "R8110vmSizeUiMDS25",
"type": "Microsoft.Compute.SizeSelector",
"visible": "[and(equals(steps('chkp').cloudGuardVersion, 'R81.10'), contains(steps('chkp').R80Offer, '(MDS25)'))]",
"label": "Virtual machine size",
"toolTip": "The VM size. Minimum of 16 cores and 64 GB RAM is required.",
"recommendedSizes": [
"Standard_D4ds_v5",
"Standard_D4d_v5"
],
"constraints": {
"excludedSizes": [
"Standard_A1_v2",
"Standard_D1_v2",
"Standard_DS1_v2",
"Standard_F1",
"Standard_F1s",
"Standard_G1",
"Standard_GS1"
]
},
"osPlatform": "Linux",
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r8110",
"sku": "mgmt-25"
},
"count": 1
},
{
"name": "R8120vmSizeUiBYOL",
"type": "Microsoft.Compute.SizeSelector",
Expand All @@ -211,7 +244,36 @@
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r8120",
"sku": "mgmt-byol"
"sku": "mds-byol-blink"
},
"count": 1
},
{
"name": "R8120vmSizeUiMDS25",
"type": "Microsoft.Compute.SizeSelector",
"visible": "[and(equals(steps('chkp').cloudGuardVersion, 'R81.20'), contains(steps('chkp').R80Offer, '(MDS25)'))]",
"label": "Virtual machine size",
"toolTip": "The VM size. Minimum of 16 cores and 64 GB RAM is required.",
"recommendedSizes": [
"Standard_D4ds_v5",
"Standard_D4d_v5"
],
"constraints": {
"excludedSizes": [
"Standard_A1_v2",
"Standard_D1_v2",
"Standard_DS1_v2",
"Standard_F1",
"Standard_F1s",
"Standard_G1",
"Standard_GS1"
]
},
"osPlatform": "Linux",
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r8120",
"sku": "mds-25-blink"
},
"count": 1
},
Expand Down Expand Up @@ -240,7 +302,36 @@
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r82",
"sku": "mgmt-byol"
"sku": "mds-byol-blink"
},
"count": 1
},
{
"name": "R82vmSizeUiMDS25",
"type": "Microsoft.Compute.SizeSelector",
"visible": "[and(equals(steps('chkp').cloudGuardVersion, 'R82'), contains(steps('chkp').R80Offer, '(MDS25)'))]",
"label": "Virtual machine size",
"toolTip": "The VM size. Minimum of 16 cores and 64 GB RAM is required.",
"recommendedSizes": [
"Standard_D4ds_v5",
"Standard_D4d_v5"
],
"constraints": {
"excludedSizes": [
"Standard_A1_v2",
"Standard_D1_v2",
"Standard_DS1_v2",
"Standard_F1",
"Standard_F1s",
"Standard_G1",
"Standard_GS1"
]
},
"osPlatform": "Linux",
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r82",
"sku": "mds-25-blink"
},
"count": 1
},
Expand Down Expand Up @@ -269,7 +360,36 @@
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r8210",
"sku": "mgmt-byol"
"sku": "mds-byol-blink"
},
"count": 1
},
{
"name": "R8210vmSizeUiMDS25",
"type": "Microsoft.Compute.SizeSelector",
"visible": "[and(equals(steps('chkp').cloudGuardVersion, 'R82.10'), contains(steps('chkp').R80Offer, '(MDS25)'))]",
"label": "Virtual machine size",
"toolTip": "The VM size. Minimum of 16 cores and 64 GB RAM is required.",
"recommendedSizes": [
"Standard_D4ds_v5",
"Standard_D4d_v5"
],
"constraints": {
"excludedSizes": [
"Standard_A1_v2",
"Standard_D1_v2",
"Standard_DS1_v2",
"Standard_F1",
"Standard_F1s",
"Standard_G1",
"Standard_GS1"
]
},
"osPlatform": "Linux",
"imageReference": {
"publisher": "checkpoint",
"offer": "check-point-cg-r8210",
"sku": "mds-25-blink"
},
"count": 1
},
Expand Down Expand Up @@ -824,7 +944,7 @@
"authenticationType": "[basics('auth').authenticationType]",
"sshPublicKey": "[basics('auth').sshPublicKey]",
"vmName": "[basics('gatewayNameUi')]",
"vmSize": "[coalesce(steps('chkp').R8110vmSizeUiBYOL, steps('chkp').R8120vmSizeUiBYOL, steps('chkp').R82vmSizeUiBYOL, steps('chkp').R8210vmSizeUiBYOL)]",
"vmSize": "[coalesce(steps('chkp').R8110vmSizeUiBYOL, steps('chkp').R8110vmSizeUiMDS25, steps('chkp').R8120vmSizeUiBYOL, steps('chkp').R8120vmSizeUiMDS25, steps('chkp').R82vmSizeUiBYOL, steps('chkp').R82vmSizeUiMDS25, steps('chkp').R8210vmSizeUiBYOL, steps('chkp').R8210vmSizeUiMDS25)]",
"virtualNetworkName": "[steps('network').virtualNetwork.name]",
"virtualNetworkAddressPrefix": "[steps('network').virtualNetwork.addressPrefix]",
"Subnet1Name": "[steps('network').virtualNetwork.subnets.subnet1.name]",
Expand Down
67 changes: 60 additions & 7 deletions azure/templates/marketplace-mds/mainTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@
"type": "string",
"allowedValues": [
"R81.10 - Bring Your Own License",
"R81.10 - Pay As You Go (MDS25)",
"R81.20 - Bring Your Own License",
"R81.20 - Pay As You Go (MDS25)",
"R82 - Bring Your Own License",
"R82.10 - Bring Your Own License"
"R82 - Pay As You Go (MDS25)",
"R82.10 - Bring Your Own License",
"R82.10 - Pay As You Go (MDS25)"
],
"defaultValue": "R82 - Bring Your Own License",
"metadata": {
Expand Down Expand Up @@ -217,6 +221,13 @@
"description": "The URI of the blob containing the development image"
}
},
"useBlinkImage": {
"type": "bool",
"defaultValue": true,
"metadata": {
"description": "Use the Blink image for accelerated deployment. Applicable for R81.20 and above"
}
},
"availabilityZones": {
"type": "array",
"defaultValue": [],
Expand Down Expand Up @@ -306,18 +317,27 @@
"location": "[parameters('location')]",
"offers": {
"R81.10 - Bring Your Own License": "BYOL",
"R81.10 - Pay As You Go (MDS25)": "MDS25",
"R81.20 - Bring Your Own License": "BYOL",
"R81.20 - Pay As You Go (MDS25)": "MDS25",
"R82 - Bring Your Own License": "BYOL",
"R82.10 - Bring Your Own License": "BYOL"
"R82 - Pay As You Go (MDS25)": "MDS25",
"R82.10 - Bring Your Own License": "BYOL",
"R82.10 - Pay As You Go (MDS25)": "MDS25"
},
"offer": "[variables('offers')[parameters('cloudGuardVersion')]]",
"osVersions": {
"R81.10 - Bring Your Own License": "R8110",
"R81.10 - Pay As You Go (MDS25)": "R8110",
"R81.20 - Bring Your Own License": "R8120",
"R81.20 - Pay As You Go (MDS25)": "R8120",
"R82 - Bring Your Own License": "R82",
"R82.10 - Bring Your Own License": "R8210"
"R82 - Pay As You Go (MDS25)": "R82",
"R82.10 - Bring Your Own License": "R8210",
"R82.10 - Pay As You Go (MDS25)": "R8210"
},
"osVersion": "[variables('osVersions')[parameters('cloudGuardVersion')]]",
"blinkVersionSupported": "[or(equals(variables('osVersion'), 'R8120'), equals(variables('osVersion'), 'R82'), equals(variables('osVersion'), 'R8210'))]",
"serialConsoleGeographies": {
"eastasia": [
"4.145.74.168",
Expand Down Expand Up @@ -1090,8 +1110,8 @@
]
},
"serialConsoleIps": "[if(contains(variables('serialConsoleGeographies'),variables('location')),variables('serialConsoleGeographies')[variables('location')],createArray())]",
"storageAccountIps": "[concat(variables('SerialConsoleIps'),parameters('storageAccountAdditionalIps'))]",
"isBlink": "[bool('false')]",
"storageAccountIps": "[concat(variables('serialConsoleIps'),parameters('storageAccountAdditionalIps'))]",
"isBlink": "[and(parameters('useBlinkImage'), variables('blinkVersionSupported'))]",
"useAZ": "[equals(parameters('availabilityZonesChoice'), 'Yes')]",
"primary": "[equals(parameters('installationType'), 'mds-primary')]",
"secondary": "[equals(parameters('installationType'), 'mds-secondary')]",
Expand All @@ -1108,7 +1128,25 @@
"sku": "mgmt-byol",
"version": "latest"
},
"imageReferenceMarketplace": "[variables('imageReferenceBYOL')]",
"imageReferenceMDS25": {
"offer": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]",
"sku": "mgmt-25",
"version": "latest"
},
"imageReferenceBYOLBlink": {
"offer": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]",
"sku": "mds-byol-blink",
"version": "latest"
},
"imageReferenceMDS25Blink": {
"offer": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]",
"sku": "mds-25-blink",
"version": "latest"
},
"imageReferenceMarketplace": "[if(variables('blinkVersionSupported'), if(equals(variables('offer'), 'BYOL'), variables('imageReferenceBYOLBlink'), variables('imageReferenceMDS25Blink')), if(equals(variables('offer'), 'BYOL'), variables('imageReferenceBYOL'), variables('imageReferenceMDS25')))]",
"customImage": "customImage",
"imageReferenceCustomUri": {
"id": "[resourceId('Microsoft.Compute/images/', variables('customImage'))]"
Expand All @@ -1135,7 +1173,22 @@
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"plan": "[if(equals(variables('offer'), 'BYOL'), variables('planBYOL'), variables('planBYOL'))]",
"planMDS25": {
"name": "mgmt-25",
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"planBYOLBlink": {
"name": "mds-byol-blink",
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"planMDS25Blink": {
"name": "mds-25-blink",
"product": "[variables('imageOffer')]",
"publisher": "[variables('imagePublisher')]"
},
"plan": "[if(variables('blinkVersionSupported'), if(equals(variables('offer'), 'BYOL'), variables('planBYOLBlink'), variables('planMDS25Blink')), if(equals(variables('offer'), 'BYOL'), variables('planBYOL'), variables('planMDS25')))]",
"identity": "[if(parameters('msi'), json('{\"type\": \"SystemAssigned\"}'), json('null'))]",
"publicIPAddressName": "[parameters('vmName')]",
"publicIPAddressId": "[resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName'))]",
Expand Down