diff --git a/pkg/volume/azure_dd/azure_dd_max_disk_count.go b/pkg/volume/azure_dd/azure_dd_max_disk_count.go index 3e6289cd24e..7fd830ffb5a 100644 --- a/pkg/volume/azure_dd/azure_dd_max_disk_count.go +++ b/pkg/volume/azure_dd/azure_dd_max_disk_count.go @@ -1,7 +1,7 @@ // +build !providerless /* -Copyright 2019 The Kubernetes Authors. +Copyright 2020 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -45,9 +45,12 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_A8M_V2": 16, "STANDARD_A8_V2": 16, "STANDARD_A9": 64, + "STANDARD_B12MS": 16, + "STANDARD_B16MS": 32, "STANDARD_B1LS": 2, "STANDARD_B1MS": 2, "STANDARD_B1S": 2, + "STANDARD_B20MS": 32, "STANDARD_B2MS": 4, "STANDARD_B2S": 4, "STANDARD_B4MS": 8, @@ -66,20 +69,30 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_D14_V2": 64, "STANDARD_D14_V2_PROMO": 64, "STANDARD_D15_V2": 64, + "STANDARD_D16AS_V4": 32, + "STANDARD_D16A_V4": 32, "STANDARD_D16S_V3": 32, "STANDARD_D16_V3": 32, "STANDARD_D1_V2": 4, "STANDARD_D2": 8, + "STANDARD_D2AS_V4": 4, + "STANDARD_D2A_V4": 4, "STANDARD_D2S_V3": 4, "STANDARD_D2_V2": 8, "STANDARD_D2_V2_PROMO": 8, "STANDARD_D2_V3": 4, "STANDARD_D3": 16, + "STANDARD_D32AS_V4": 32, + "STANDARD_D32A_V4": 32, "STANDARD_D32S_V3": 32, "STANDARD_D32_V3": 32, "STANDARD_D3_V2": 16, "STANDARD_D3_V2_PROMO": 16, "STANDARD_D4": 32, + "STANDARD_D48S_V3": 32, + "STANDARD_D48_V3": 32, + "STANDARD_D4AS_V4": 8, + "STANDARD_D4A_V4": 8, "STANDARD_D4S_V3": 8, "STANDARD_D4_V2": 32, "STANDARD_D4_V2_PROMO": 32, @@ -88,10 +101,17 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_D5_V2_PROMO": 64, "STANDARD_D64S_V3": 32, "STANDARD_D64_V3": 32, + "STANDARD_D8AS_V4": 16, + "STANDARD_D8A_V4": 16, "STANDARD_D8S_V3": 16, "STANDARD_D8_V3": 16, + "STANDARD_DC1S_V2": 1, "STANDARD_DC2S": 2, + "STANDARD_DC2S_V2": 2, "STANDARD_DC4S": 4, + "STANDARD_DC4S_V2": 4, + "STANDARD_DC8S": 8, + "STANDARD_DC8_V2": 8, "STANDARD_DS11-1_V2": 8, "STANDARD_DS11": 8, "STANDARD_DS11_V2": 8, @@ -127,29 +147,46 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_DS5_V2_PROMO": 64, "STANDARD_E16-4S_V3": 32, "STANDARD_E16-8S_V3": 32, + "STANDARD_E16AS_V4": 32, + "STANDARD_E16A_V4": 32, "STANDARD_E16S_V3": 32, "STANDARD_E16_V3": 32, + "STANDARD_E20AS_V4": 32, + "STANDARD_E20A_V4": 32, "STANDARD_E20S_V3": 32, "STANDARD_E20_V3": 32, + "STANDARD_E2AS_V4": 4, + "STANDARD_E2A_V4": 4, "STANDARD_E2S_V3": 4, "STANDARD_E2_V3": 4, "STANDARD_E32-16S_V3": 32, "STANDARD_E32-8S_V3": 32, + "STANDARD_E32AS_V4": 32, + "STANDARD_E32A_V4": 32, "STANDARD_E32S_V3": 32, "STANDARD_E32_V3": 32, "STANDARD_E4-2S_V3": 8, + "STANDARD_E48AS_V4": 32, + "STANDARD_E48S_V3": 32, + "STANDARD_E48_V3": 32, + "STANDARD_E4AS_V4": 8, + "STANDARD_E4A_V4": 8, "STANDARD_E4S_V3": 8, "STANDARD_E4_V3": 8, "STANDARD_E64-16S_V3": 32, "STANDARD_E64-32S_V3": 32, + "STANDARD_E64AS_V4": 32, "STANDARD_E64IS_V3": 32, "STANDARD_E64I_V3": 32, "STANDARD_E64S_V3": 32, "STANDARD_E64_V3": 32, "STANDARD_E8-2S_V3": 16, "STANDARD_E8-4S_V3": 16, + "STANDARD_E8AS_V4": 16, + "STANDARD_E8A_V4": 16, "STANDARD_E8S_V3": 16, "STANDARD_E8_V3": 16, + "STANDARD_E96AS_V4": 32, "STANDARD_F1": 4, "STANDARD_F16": 64, "STANDARD_F16S": 64, @@ -160,6 +197,7 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_F2S_V2": 4, "STANDARD_F32S_V2": 32, "STANDARD_F4": 16, + "STANDARD_F48S_V2": 32, "STANDARD_F4S": 16, "STANDARD_F4S_V2": 8, "STANDARD_F64S_V2": 32, @@ -193,12 +231,14 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_H8M": 32, "STANDARD_H8M_PROMO": 32, "STANDARD_H8_PROMO": 32, + "STANDARD_HB120RS_V2": 8, "STANDARD_HB60RS": 4, "STANDARD_HC44RS": 4, "STANDARD_L16S": 64, "STANDARD_L16S_V2": 32, "STANDARD_L32S": 64, "STANDARD_L32S_V2": 32, + "STANDARD_L48S_V2": 32, "STANDARD_L4S": 16, "STANDARD_L64S_V2": 32, "STANDARD_L80S_V2": 32, @@ -220,6 +260,8 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_M32LS": 32, "STANDARD_M32MS": 32, "STANDARD_M32TS": 32, + "STANDARD_M416MS_V2": 64, + "STANDARD_M416S_V2": 64, "STANDARD_M64-16MS": 64, "STANDARD_M64-32MS": 64, "STANDARD_M64": 64, @@ -249,7 +291,12 @@ var maxDataDiskCountMap = map[string]int64{ "STANDARD_ND12S": 24, "STANDARD_ND24RS": 32, "STANDARD_ND24S": 32, + "STANDARD_ND40RS_V2": 8, + "STANDARD_ND40S_V3": 32, "STANDARD_ND6S": 12, + "STANDARD_NP10S": 8, + "STANDARD_NP20S": 16, + "STANDARD_NP40S": 32, "STANDARD_NV12": 48, "STANDARD_NV12_PROMO": 48, "STANDARD_NV12S_V2": 24, diff --git a/pkg/volume/azure_dd/azure_dd_test.go b/pkg/volume/azure_dd/azure_dd_test.go index 6d93567c610..0abec59f202 100644 --- a/pkg/volume/azure_dd/azure_dd_test.go +++ b/pkg/volume/azure_dd/azure_dd_test.go @@ -67,6 +67,10 @@ func TestGetMaxDataDiskCount(t *testing.T) { instanceType: "standard_d2_v2", expectResult: 8, }, + { + instanceType: "Standard_DS14_V2", + expectResult: 64, + }, { instanceType: "NOT_EXISTING", expectResult: defaultAzureVolumeLimit,