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

Jump to bottom

align VM instance types and disk sizes #732

Merged
merged 1 commit into from
Oct 17, 2024
Merged

align VM instance types and disk sizes #732

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
4 changes: 3 additions & 1 deletion dev-infrastructure/configurations/cs-integ-mgmt-cluster.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ param aksKeyVaultName = 'aks-kv-cs-integ-mc-1'
param systemAgentMinCount = 2
param systemAgentMaxCount = 6
param systemAgentVMSize = 'Standard_D2s_v3'
param aksSystemOsDiskSizeGB = 32
param userAgentMinCount = 1
param userAgentMaxCount = 12
param userAgentVMSize = 'Standard_D2s_v3'
param userAgentVMSize = 'Standard_D2s_v3' // todo bump later
param aksUserOsDiskSizeGB = 32 // todo bump later
param userAgentPoolAZCount = 3
param persist = true

Expand Down
2 changes: 2 additions & 0 deletions dev-infrastructure/configurations/mgmt-cluster.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ param aksEtcdKVEnableSoftDelete = false
param systemAgentMinCount = 2
param systemAgentMaxCount = 3
param systemAgentVMSize = 'Standard_D2s_v3'
param aksSystemOsDiskSizeGB = 32
param userAgentMinCount = 1
param userAgentMaxCount = 6
param userAgentVMSize = 'Standard_D4s_v3'
param aksUserOsDiskSizeGB = 100
param userAgentPoolAZCount = 3
param persist = false

Expand Down
6 changes: 4 additions & 2 deletions dev-infrastructure/configurations/mvp-mgmt-cluster.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ param aksKeyVaultName = 'aks-kv-aro-hcp-dev-mc-1'
param systemAgentMinCount = 2
param systemAgentMaxCount = 3
param systemAgentVMSize = 'Standard_D2s_v3'
param aksSystemOsDiskSizeGB = 32
param userAgentMinCount = 1
param userAgentMaxCount = 3
param userAgentVMSize = 'Standard_D2s_v3'
param userAgentMaxCount = 9
param userAgentVMSize = 'Standard_D4s_v3'
param aksUserOsDiskSizeGB = 100
param userAgentPoolAZCount = 3
param persist = true

Expand Down
4 changes: 2 additions & 2 deletions dev-infrastructure/modules/aks-cluster-base.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ param dnsPrefix string = aksClusterName
@description('Disk size (in GB) to provision for each of the agent pool nodes. This value ranges from 0 to 1023. Specifying 0 will apply the default disk size for that agentVMSize.')
@minValue(0)
@maxValue(1023)
param systemOsDiskSizeGB int = 128
param userOsDiskSizeGB int = 128
param systemOsDiskSizeGB int
param userOsDiskSizeGB int

param acrPullResourceGroups array = []

Expand Down
8 changes: 8 additions & 0 deletions dev-infrastructure/templates/mgmt-cluster.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ param currentUserId string
@description('AKS cluster name')
param aksClusterName string = 'aro-hcp-aks'

@description('Disk size for the AKS system nodes')
param aksSystemOsDiskSizeGB int

@description('Disk size for the AKS user nodes')
param aksUserOsDiskSizeGB int

@description('Names of additional resource group contains ACRs the AKS cluster will get pull permissions on')
param acrPullResourceGroups array = []

Expand Down Expand Up @@ -133,6 +139,8 @@ module mgmtCluster '../modules/aks-cluster-base.bicep' = {
systemAgentMinCount: systemAgentMinCount
systemAgentMaxCount: systemAgentMaxCount
systemAgentVMSize: systemAgentVMSize
systemOsDiskSizeGB: aksSystemOsDiskSizeGB
userOsDiskSizeGB: aksUserOsDiskSizeGB
}
}

Expand Down
8 changes: 8 additions & 0 deletions dev-infrastructure/templates/svc-cluster.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ param currentUserId string
@description('AKS cluster name')
param aksClusterName string

@description('Disk size for the AKS system nodes')
param aksSystemOsDiskSizeGB int = 32

@description('Disk size for the AKS user nodes')
param aksUserOsDiskSizeGB int = 32

@description('Names of additional resource group contains ACRs the AKS cluster will get pull permissions on')
param acrPullResourceGroups array = []

Expand Down Expand Up @@ -152,6 +158,8 @@ module svcCluster '../modules/aks-cluster-base.bicep' = {
subnetPrefix: subnetPrefix
podSubnetPrefix: podSubnetPrefix
clusterType: 'svc-cluster'
systemOsDiskSizeGB: aksSystemOsDiskSizeGB
userOsDiskSizeGB: aksUserOsDiskSizeGB
workloadIdentities: items({
frontend_wi: {
uamiName: 'frontend'
Expand Down
Loading