Skip to content

Commit

Permalink
Merge pull request #2685 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history 
…2682-to-release-1.29

[release-1.29] fix: update max data disk count table with v6 VM sku
  • Loading branch information
@andyzhangx
andyzhangx authored Nov 28, 2024
2 parents fd89267 + 0439a6a commit dec89a7
Showing 1 changed file with 75 additions and 0 deletions.
75 changes: 75 additions & 0 deletions pkg/azuredisk/azure_dd_max_disk_count.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D14_V2_PROMO": 64,
"STANDARD_D15_V2": 64,
"STANDARD_D16ADS_V5": 32,
"STANDARD_D16ADS_V6": 32,
"STANDARD_D16ALDS_V6": 32,
"STANDARD_D16ALS_V6": 32,
"STANDARD_D16AS_V3": 32,
"STANDARD_D16AS_V4": 32,
"STANDARD_D16AS_V5": 32,
"STANDARD_D16AS_V6": 32,
"STANDARD_D16A_V3": 32,
"STANDARD_D16A_V4": 32,
"STANDARD_D16DARM_V3": 32,
Expand All @@ -135,9 +139,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D1_V2": 4,
"STANDARD_D2": 8,
"STANDARD_D2ADS_V5": 4,
"STANDARD_D2ADS_V6": 4,
"STANDARD_D2ALDS_V6": 4,
"STANDARD_D2ALS_V6": 4,
"STANDARD_D2AS_V3": 4,
"STANDARD_D2AS_V4": 4,
"STANDARD_D2AS_V5": 4,
"STANDARD_D2AS_V6": 4,
"STANDARD_D2A_V3": 4,
"STANDARD_D2A_V4": 4,
"STANDARD_D2DARM_V3": 4,
Expand Down Expand Up @@ -165,9 +173,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D2_V5": 4,
"STANDARD_D3": 16,
"STANDARD_D32ADS_V5": 32,
"STANDARD_D32ADS_V6": 32,
"STANDARD_D32ALDS_V6": 32,
"STANDARD_D32ALS_V6": 32,
"STANDARD_D32AS_V3": 32,
"STANDARD_D32AS_V4": 32,
"STANDARD_D32AS_V5": 32,
"STANDARD_D32AS_V6": 32,
"STANDARD_D32A_V3": 32,
"STANDARD_D32A_V4": 32,
"STANDARD_D32DARM_V3": 32,
Expand Down Expand Up @@ -195,9 +207,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D3_V2_PROMO": 16,
"STANDARD_D4": 32,
"STANDARD_D48ADS_V5": 32,
"STANDARD_D48ADS_V6": 32,
"STANDARD_D48ALDS_V6": 32,
"STANDARD_D48ALS_V6": 32,
"STANDARD_D48AS_V3": 32,
"STANDARD_D48AS_V4": 32,
"STANDARD_D48AS_V5": 32,
"STANDARD_D48AS_V6": 32,
"STANDARD_D48A_V3": 32,
"STANDARD_D48A_V4": 32,
"STANDARD_D48DARM_V3": 32,
Expand All @@ -222,9 +238,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D48_V4": 32,
"STANDARD_D48_V5": 32,
"STANDARD_D4ADS_V5": 8,
"STANDARD_D4ADS_V6": 8,
"STANDARD_D4ALDS_V6": 8,
"STANDARD_D4ALS_V6": 8,
"STANDARD_D4AS_V3": 8,
"STANDARD_D4AS_V4": 8,
"STANDARD_D4AS_V5": 8,
"STANDARD_D4AS_V6": 8,
"STANDARD_D4A_V3": 8,
"STANDARD_D4A_V4": 8,
"STANDARD_D4DARM_V3": 8,
Expand Down Expand Up @@ -253,9 +273,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D5_V2": 64,
"STANDARD_D5_V2_PROMO": 64,
"STANDARD_D64ADS_V5": 32,
"STANDARD_D64ADS_V6": 32,
"STANDARD_D64ALDS_V6": 32,
"STANDARD_D64ALS_V6": 32,
"STANDARD_D64AS_V3": 32,
"STANDARD_D64AS_V4": 32,
"STANDARD_D64AS_V5": 32,
"STANDARD_D64AS_V6": 32,
"STANDARD_D64A_V3": 32,
"STANDARD_D64A_V4": 32,
"STANDARD_D64DARM_V3": 32,
Expand All @@ -280,9 +304,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D64_V4": 32,
"STANDARD_D64_V5": 32,
"STANDARD_D8ADS_V5": 16,
"STANDARD_D8ADS_V6": 16,
"STANDARD_D8ALDS_V6": 16,
"STANDARD_D8ALS_V6": 16,
"STANDARD_D8AS_V3": 16,
"STANDARD_D8AS_V4": 16,
"STANDARD_D8AS_V5": 16,
"STANDARD_D8AS_V6": 16,
"STANDARD_D8A_V3": 16,
"STANDARD_D8A_V4": 16,
"STANDARD_D8DARM_V3": 16,
Expand All @@ -307,9 +335,13 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_D8_V4": 16,
"STANDARD_D8_V5": 16,
"STANDARD_D96ADS_V5": 32,
"STANDARD_D96ADS_V6": 32,
"STANDARD_D96ALDS_V6": 32,
"STANDARD_D96ALS_V6": 32,
"STANDARD_D96AS_V3": 32,
"STANDARD_D96AS_V4": 32,
"STANDARD_D96AS_V5": 32,
"STANDARD_D96AS_V6": 32,
"STANDARD_D96A_V3": 32,
"STANDARD_D96A_V4": 32,
"STANDARD_DC16DMS_V3": 32,
Expand Down Expand Up @@ -368,6 +400,8 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_DC32AS_V4": 32,
"STANDARD_DC32AS_V5": 32,
"STANDARD_DC32DS_V3": 32,
"STANDARD_DC32EDS_V5": 32,
"STANDARD_DC32ES_V5": 32,
"STANDARD_DC48EDS_V5": 32,
"STANDARD_DC48ES_V5": 32,
"STANDARD_DC32S_V3": 32,
Expand Down Expand Up @@ -472,8 +506,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E16-8S_V4": 32,
"STANDARD_E16-8S_V5": 32,
"STANDARD_E16ADS_V5": 32,
"STANDARD_E16ADS_V6": 32,
"STANDARD_E16AS_V4": 32,
"STANDARD_E16AS_V5": 32,
"STANDARD_E16AS_V6": 32,
"STANDARD_E16A_V4": 32,
"STANDARD_E16BDS_V5": 32,
"STANDARD_E16BS_V5": 32,
Expand All @@ -493,8 +529,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E16_V4": 32,
"STANDARD_E16_V5": 32,
"STANDARD_E20ADS_V5": 32,
"STANDARD_E20ADS_V6": 32,
"STANDARD_E20AS_V4": 32,
"STANDARD_E20AS_V5": 32,
"STANDARD_E20AS_V6": 32,
"STANDARD_E20A_V4": 32,
"STANDARD_E20DARM_V3": 32,
"STANDARD_E20DS_V4": 32,
Expand All @@ -510,8 +548,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E20_V4": 32,
"STANDARD_E20_V5": 32,
"STANDARD_E2ADS_V5": 4,
"STANDARD_E2ADS_V6": 4,
"STANDARD_E2AS_V4": 4,
"STANDARD_E2AS_V5": 4,
"STANDARD_E2AS_V6": 4,
"STANDARD_E2A_V4": 4,
"STANDARD_E2BDS_V5": 4,
"STANDARD_E2BS_V5": 4,
Expand Down Expand Up @@ -547,8 +587,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E32-8S_V4": 32,
"STANDARD_E32-8S_V5": 32,
"STANDARD_E32ADS_V5": 32,
"STANDARD_E32ADS_V6": 32,
"STANDARD_E32AS_V4": 32,
"STANDARD_E32AS_V5": 32,
"STANDARD_E32AS_V6": 32,
"STANDARD_E32A_V4": 32,
"STANDARD_E32BDS_V5": 32,
"STANDARD_E32BS_V5": 32,
Expand Down Expand Up @@ -576,8 +618,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E4-2S_V4": 8,
"STANDARD_E4-2S_V5": 8,
"STANDARD_E48ADS_V5": 32,
"STANDARD_E48ADS_V6": 32,
"STANDARD_E48AS_V4": 32,
"STANDARD_E48AS_V5": 32,
"STANDARD_E48AS_V6": 32,
"STANDARD_E48A_V4": 32,
"STANDARD_E48BDS_V5": 32,
"STANDARD_E48BS_V5": 32,
Expand All @@ -597,8 +641,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E48_V4": 32,
"STANDARD_E48_V5": 32,
"STANDARD_E4ADS_V5": 8,
"STANDARD_E4ADS_V6": 8,
"STANDARD_E4AS_V4": 8,
"STANDARD_E4AS_V5": 8,
"STANDARD_E4AS_V6": 8,
"STANDARD_E4A_V4": 8,
"STANDARD_E4BDS_V5": 8,
"STANDARD_E4BS_V5": 8,
Expand Down Expand Up @@ -634,8 +680,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E64-32S_V4": 32,
"STANDARD_E64-32S_V5": 32,
"STANDARD_E64ADS_V5": 32,
"STANDARD_E64ADS_V6": 32,
"STANDARD_E64AS_V4": 32,
"STANDARD_E64AS_V5": 32,
"STANDARD_E64AS_V6": 32,
"STANDARD_E64A_V4": 32,
"STANDARD_E64BDS_V5": 32,
"STANDARD_E64BS_V5": 32,
Expand Down Expand Up @@ -675,8 +723,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E8-4S_V4": 16,
"STANDARD_E8-4S_V5": 32,
"STANDARD_E8ADS_V5": 16,
"STANDARD_E8ADS_V6": 16,
"STANDARD_E8AS_V4": 16,
"STANDARD_E8AS_V5": 16,
"STANDARD_E8AS_V6": 16,
"STANDARD_E8A_V4": 16,
"STANDARD_E8BDS_V5": 16,
"STANDARD_E8BS_V5": 16,
Expand Down Expand Up @@ -706,8 +756,10 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_E96-48DS_V5": 32,
"STANDARD_E96-48S_V5": 32,
"STANDARD_E96ADS_V5": 32,
"STANDARD_E96ADS_V6": 32,
"STANDARD_E96AS_V4": 32,
"STANDARD_E96AS_V5": 32,
"STANDARD_E96AS_V6": 32,
"STANDARD_E96A_V4": 32,
"STANDARD_E96BDS_V5": 32,
"STANDARD_E96BS_V5": 32,
Expand Down Expand Up @@ -776,20 +828,41 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_EC96IAS_V5": 32,
"STANDARD_F1": 4,
"STANDARD_F16": 64,
"STANDARD_F16ALS_V6": 32,
"STANDARD_F16AMS_V6": 32,
"STANDARD_F16AS_V6": 32,
"STANDARD_F16S": 64,
"STANDARD_F16S_V2": 32,
"STANDARD_F1S": 4,
"STANDARD_F2": 8,
"STANDARD_F2ALS_V6": 4,
"STANDARD_F2AMS_V6": 4,
"STANDARD_F2AS_V6": 4,
"STANDARD_F2S": 8,
"STANDARD_F2S_V2": 4,
"STANDARD_F32ALS_V6": 32,
"STANDARD_F32AMS_V6": 32,
"STANDARD_F32AS_V6": 32,
"STANDARD_F32S_V2": 32,
"STANDARD_F4": 16,
"STANDARD_F48ALS_V6": 32,
"STANDARD_F48AMS_V6": 32,
"STANDARD_F48AS_V6": 32,
"STANDARD_F48S_V2": 32,
"STANDARD_F4ALS_V6": 8,
"STANDARD_F4AMS_V6": 8,
"STANDARD_F4AS_V6": 8,
"STANDARD_F4S": 16,
"STANDARD_F4S_V2": 8,
"STANDARD_F64ALS_V6": 32,
"STANDARD_F64AMS_V6": 32,
"STANDARD_F64AS_V6": 32,
"STANDARD_F64S_V2": 32,
"STANDARD_F72S_V2": 32,
"STANDARD_F8": 32,
"STANDARD_F8ALS_V6": 16,
"STANDARD_F8AMS_V6": 16,
"STANDARD_F8AS_V6": 16,
"STANDARD_F8S": 32,
"STANDARD_F8S_V2": 16,
"STANDARD_FX12MDS": 24,
Expand Down Expand Up @@ -994,6 +1067,7 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_NC80ADIS_H100_V5": 16,
"STANDARD_NC8AS_T4_V3": 16,
"STANDARD_NC96ADS_A100_V4": 32,
"STANDARD_NCC40ADS_H100_V5": 8,
"STANDARD_ND96IS_MI300X_V5": 16,
"STANDARD_ND96ISRF_H100_V5": 16,
"STANDARD_ND100IS_H100_V5": 16,
Expand All @@ -1018,6 +1092,7 @@ var maxDataDiskCountMap = map[string]int64{
"STANDARD_ND96ASR_V4": 16,
"STANDARD_ND96IS_H100_V5": 16,
"STANDARD_ND96ISR_H100_V5": 16,
"STANDARD_ND96ISR_H200_V5": 16,
"STANDARD_NG16ADS_V620_V1": 16,
"STANDARD_NG32ADMS_V620_V1": 32,
"STANDARD_NG32ADS_V620_V1": 32,
Expand Down

0 comments on commit dec89a7

Please sign in to comment.