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

Fix/integrate with alz #153

Merged
merged 4 commits into from
Oct 21, 2024
Merged

Fix/integrate with alz #153

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
2d4b8d3
parametrize vmSize
Oct 4, 2024
d5e4ebe
add main.json
Oct 4, 2024
0ba7a77
add parameter for jumpbox VM size as well as AKS VMs
Oct 4, 2024
3949df9
Merge branch 'main' into fix/integrate-with-ALZ
mosabami Oct 21, 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
3 changes: 2 additions & 1 deletion Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/04-Network-LZ/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ param spokeSubnetAppGWPrefix string = '10.1.2.0/27'
param spokeSubnetVMPrefix string = '10.1.3.0/24'
param spokeSubnetPLinkervicePrefix string = '10.1.4.0/24'
param remotePeeringName string = 'spoke-hub-peering'
param vmSize string = 'Standard_DS2_v2'

var privateDNSZoneAKSSuffixes = {
AzureCloud: '.azmk8s.io'
Expand Down Expand Up @@ -350,7 +351,7 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.5.0' = {
}
}
osType: 'Linux'
vmSize: 'Standard_DS2_v2'
vmSize: vmSize
zone: 0
// Non-required parameters
disablePasswordAuthentication: false
Expand Down
3 changes: 2 additions & 1 deletion Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/06-AKS-cluster/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ param keyvaultName string
param acrName string
param aksClusterName string
param enablePrivateCluster bool = true
param vmSize string = 'Standard_D4d_v5'


@allowed([
Expand Down Expand Up @@ -106,7 +107,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:0.1.2
osType: 'Linux'
serviceCidr: ''
type: 'VirtualMachineScaleSets'
vmSize: 'Standard_D4d_v5'
vmSize: vmSize
vnetSubnetID: aksSubnet.id
}
]
Expand Down
4 changes: 4 additions & 0 deletions Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/All-in-One-Bicep/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ param azureBastionSubnetName string = 'AzureBastionSubnet'
param azureBastionSubnetAddressPrefix string = '10.0.2.0/27'
param vmsubnetSubnetName string = 'vmsubnet'
param vmsubnetSubnetAddressPrefix string = '10.0.3.0/24'
param linuxVirtualMachineVMSize string = 'Standard_DS2_v2'

/////////////////
// 05-AKS-Supporting
Expand Down Expand Up @@ -299,6 +300,7 @@ param aksadminaccessprincipalId string
param kubernetesVersion string = '1.30'
param networkPlugin string = 'azure'
param aksClusterName string = 'aksCluster'
param aksVMSize string = 'Standard_D4d_v5'

//////////////////////////////////
//////////////////////////////////
Expand Down Expand Up @@ -366,6 +368,7 @@ module networkSpoke '../04-Network-LZ/main.bicep' = {
spokeSubnetVMPrefix:spokeSubnetVMPrefix
spokeSubnetPLinkervicePrefix: spokeSubnetPLinkervicePrefix
remotePeeringName: remotePeeringName
vmSize: linuxVirtualMachineVMSize

}
dependsOn: deployHub ? [networkHub] : []
Expand Down Expand Up @@ -411,5 +414,6 @@ module aksCluster '../06-AKS-Cluster/main.bicep' = {
networkPlugin: networkPlugin
acrName: aksSupporting.outputs.acrName
aksClusterName: aksClusterName
vmSize: aksVMSize
}
}
54 changes: 38 additions & 16 deletions Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/All-in-One-Bicep/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "5950662107880979924"
"version": "0.30.23.60470",
"templateHash": "2060098085920409973"
}
},
"parameters": {
Expand Down Expand Up @@ -365,6 +365,10 @@
"type": "string",
"defaultValue": "10.0.3.0/24"
},
"linuxVirtualMachineVMSize": {
"type": "string",
"defaultValue": "Standard_DS2_v2"
},
"subnetName": {
"type": "string",
"defaultValue": "servicespe"
Expand Down Expand Up @@ -437,6 +441,10 @@
"aksClusterName": {
"type": "string",
"defaultValue": "aksCluster"
},
"aksVMSize": {
"type": "string",
"defaultValue": "Standard_D4d_v5"
}
},
"resources": [
Expand Down Expand Up @@ -519,8 +527,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "14622037900232296803"
"version": "0.30.23.60470",
"templateHash": "4940105280913712153"
}
},
"parameters": {
Expand Down Expand Up @@ -7634,8 +7642,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "2475204222112158833"
"version": "0.30.23.60470",
"templateHash": "3968621880291748711"
}
},
"parameters": {
Expand Down Expand Up @@ -7745,6 +7753,9 @@
},
"remotePeeringName": {
"value": "[parameters('remotePeeringName')]"
},
"vmSize": {
"value": "[parameters('linuxVirtualMachineVMSize')]"
}
},
"template": {
Expand All @@ -7753,8 +7764,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "1962386068872565768"
"version": "0.30.23.60470",
"templateHash": "7704816282859867531"
}
},
"parameters": {
Expand Down Expand Up @@ -7832,6 +7843,10 @@
"remotePeeringName": {
"type": "string",
"defaultValue": "spoke-hub-peering"
},
"vmSize": {
"type": "string",
"defaultValue": "Standard_DS2_v2"
}
},
"variables": {
Expand Down Expand Up @@ -22010,8 +22025,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "10032112452026088344"
"version": "0.30.23.60470",
"templateHash": "16081152647582805778"
}
},
"parameters": {
Expand Down Expand Up @@ -22649,7 +22664,7 @@
"value": "Linux"
},
"vmSize": {
"value": "Standard_DS2_v2"
"value": "[parameters('vmSize')]"
},
"zone": {
"value": 0
Expand Down Expand Up @@ -28076,8 +28091,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "18380292763349642779"
"version": "0.30.23.60470",
"templateHash": "17393039019645740941"
}
},
"parameters": {
Expand Down Expand Up @@ -37930,6 +37945,9 @@
},
"aksClusterName": {
"value": "[parameters('aksClusterName')]"
},
"vmSize": {
"value": "[parameters('aksVMSize')]"
}
},
"template": {
Expand All @@ -37938,8 +37956,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.28.1.47646",
"templateHash": "1662336602186095921"
"version": "0.30.23.60470",
"templateHash": "1266465176582274116"
}
},
"parameters": {
Expand Down Expand Up @@ -37990,6 +38008,10 @@
"type": "bool",
"defaultValue": true
},
"vmSize": {
"type": "string",
"defaultValue": "Standard_D4d_v5"
},
"networkPlugin": {
"type": "string",
"allowedValues": [
Expand Down Expand Up @@ -40484,7 +40506,7 @@
"osType": "Linux",
"serviceCidr": "",
"type": "VirtualMachineScaleSets",
"vmSize": "Standard_D4d_v5",
"vmSize": "[parameters('vmSize')]",
"vnetSubnetID": "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('rgName')), 'Microsoft.Network/virtualNetworks/subnets', split(format('{0}/{1}', parameters('vnetName'), parameters('subnetName')), '/')[0], split(format('{0}/{1}', parameters('vnetName'), parameters('subnetName')), '/')[1])]"
}
]
Expand Down
32 changes: 32 additions & 0 deletions Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/All-in-One-Bicep/main.portal.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,38 @@
"infoMessages": [],
"visible": true
},
{
"name": "aksVMSize",
"type": "Microsoft.Common.TextBox",
"label": "AKS VM Size",
"subLabel": "",
"defaultValue": "Standard_D4d_v5",
"toolTip": "VM size availability varies by region",
"constraints": {
"required": true,
"regex": "",
"validationMessage": "",
"validations": []
},
"infoMessages": [],
"visible": true
},
{
"name": "linuxVirtualMachineVMSize",
"type": "Microsoft.Common.TextBox",
"label": "Linux Jumpbox VM Size",
"subLabel": "",
"defaultValue": "Standard_DS2_v2",
"toolTip": "VM size availability varies by region",
"constraints": {
"required": true,
"regex": "",
"validationMessage": "",
"validations": []
},
"infoMessages": [],
"visible": true
},
{
"name": "aksSubnetName",
"type": "Microsoft.Common.TextBox",
Expand Down
Loading