From 95d2558687101516101687e01fe9015ade3b653d Mon Sep 17 00:00:00 2001 From: Campbell Vertesi Date: Tue, 21 May 2019 16:58:50 +0200 Subject: [PATCH] refactor: remove _Promo from static SKU lists (#1216) * test: add a SKU with _Promo suffix to test cases * fix: trim _Promo suffix when checking if Nvidia is enabled * fix: remove static entries for _Promo sizes from constants * fix: ignore _Promo SKUs in azure constants generator * fix: remove _promo SKUs from all test files * Ignore _promo for accelerated networking --- pkg/api/common/helper.go | 6 + .../httpMockClientData/deployVMRequest.json | 34 +---- pkg/engine/armvariables_test.go | 2 +- pkg/engine/engine_test.go | 15 -- .../dcos_scale_template.json | 43 ------ .../transformtestfiles/dcos_template.json | 43 ------ .../k8s_agent_upgrade_template.json | 98 +----------- .../k8s_master_upgrade_template.json | 98 +----------- .../k8s_scale_template.json | 98 +----------- .../transformtestfiles/k8s_template.json | 98 +----------- .../k8s_vnet_scale_template.json | 98 +----------- .../transformtestfiles/k8s_vnet_template.json | 98 +----------- pkg/helpers/azureconst.go | 144 ------------------ pkg/helpers/azureconst_test.go | 79 ---------- pkg/helpers/generate_azure_constants.py | 2 +- pkg/helpers/helpers.go | 19 +-- 16 files changed, 22 insertions(+), 953 deletions(-) diff --git a/pkg/api/common/helper.go b/pkg/api/common/helper.go index db38ecfe0..b4e2b052a 100644 --- a/pkg/api/common/helper.go +++ b/pkg/api/common/helper.go @@ -104,6 +104,8 @@ func IsNvidiaEnabledSKU(vmSize string) bool { "Standard_NC24s_v3": true, "Standard_NC24rs_v3": true, } + // Trim the optional _Promo suffix. + vmSize = strings.TrimSuffix(vmSize, "_Promo") if _, ok := dm[vmSize]; ok { return dm[vmSize] } @@ -124,6 +126,10 @@ func GetNSeriesVMCasesForTesting() []struct { "Standard_NC6", true, }, + { + "Standard_NC6_Promo", + true, + }, { "Standard_NC12", true, diff --git a/pkg/armhelpers/azurestack/httpMockClientData/deployVMRequest.json b/pkg/armhelpers/azurestack/httpMockClientData/deployVMRequest.json index 821516176..6a9f286aa 100644 --- a/pkg/armhelpers/azurestack/httpMockClientData/deployVMRequest.json +++ b/pkg/armhelpers/azurestack/httpMockClientData/deployVMRequest.json @@ -394,37 +394,29 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", @@ -435,35 +427,27 @@ "Standard_DS11", "Standard_DS11-1_v2", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12-1_v2", "Standard_DS12-2_v2", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16-4s_v3", "Standard_E16-8s_v3", "Standard_E16_v3", @@ -700,37 +684,29 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", @@ -741,35 +717,27 @@ "Standard_DS11", "Standard_DS11-1_v2", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12-1_v2", "Standard_DS12-2_v2", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16-4s_v3", "Standard_E16-8s_v3", "Standard_E16_v3", @@ -1883,4 +1851,4 @@ }, "mode": "Incremental" } -} +} \ No newline at end of file diff --git a/pkg/engine/armvariables_test.go b/pkg/engine/armvariables_test.go index c09c662d4..268241cc4 100644 --- a/pkg/engine/armvariables_test.go +++ b/pkg/engine/armvariables_test.go @@ -358,7 +358,7 @@ func TestK8sVars(t *testing.T) { expectedMap["subnetName"] = "[concat(parameters('orchestratorName'), '-subnet')]" expectedMap["virtualNetworkName"] = "[concat(parameters('orchestratorName'), '-vnet-', parameters('nameSuffix'))]" expectedMap["virtualNetworkResourceGroupName"] = "" - expectedMap["vmSizesMap"] = map[string]interface{}{"Standard_A0": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A10": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A11": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A1_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A2_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A2m_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A4_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A4m_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A5": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A6": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A7": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A8": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A8_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A8m_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A9": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_B1ls": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B1ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B1s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B2ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B2s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B4ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D11": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D11_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D11_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D12": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D12_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D12_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D13": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D13_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D13_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D14": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D14_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D14_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D15_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D16_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D1_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D32_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D32s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D3_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D3_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D5_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D5_v2_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D64_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D64s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D8_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DC2s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DC4s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS1": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11-1_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12-1_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12-2_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13-2_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13-4_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14-4_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14-8_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS15_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS1_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS2_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS2_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS3_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS3_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS4": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS4_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS4_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS5_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS5_v2_Promo": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E16-4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E16-8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E16_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E20_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E20s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E2_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E32-16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E32-8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E32_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E32s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E4-2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E4_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64-16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64-32s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E64i_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E64is_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E8-2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E8-4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E8_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F16": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F16s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F16s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F1s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F2s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F2s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F32s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F4s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F4s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F64s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F72s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F8": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F8s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F8s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_G1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G5": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_GS1": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS4": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS4-4": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS4-8": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS5": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS5-16": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS5-8": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_H16": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16m_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16mr": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16mr_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16r": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16r_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H8": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H8_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H8m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H8m_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_HB60rs": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_HC44rs": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L16s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L16s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L32s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L32s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L4s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L64s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L80s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L8s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L8s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M128-32ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128-64ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M128ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M16-4ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M16-8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M16ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32-16ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32-8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32ls": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32ts": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M64-16ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64-32ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64ls": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M64ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M8-2ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M8-4ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC12": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC12_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC12s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC12s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC24_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC24r": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC24r_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC24rs_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24rs_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC6_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC6": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC6s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC6s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND12s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND24rs": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND24s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND6s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV12": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV12_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV12s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV12s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV24": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV24_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV24s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV24s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV48s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV6": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV6_Promo": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV6s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_PB12s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_PB24s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_PB6s": map[string]interface{}{"storageAccountType": "Premium_LRS"}} + expectedMap["vmSizesMap"] = map[string]interface{}{"Standard_A0": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A10": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A11": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A1_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A2_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A2m_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A4_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A4m_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A5": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A6": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A7": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A8": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A8_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A8m_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_A9": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_B1ls": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B1ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B1s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B2ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B2s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B4ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_B8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D11": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D11_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D12": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D12_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D13": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D13_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D14": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D14_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D15_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D16_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D1_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D32_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D32s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D3_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D5_v2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D64_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D64s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_D8_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_D8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DC2s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DC4s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS1": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11-1_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS11_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12-1_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12-2_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS12_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13-2_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13-4_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS13_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14-4_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14-8_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS14_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS15_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS1_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS2_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS3_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS4": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS4_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_DS5_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E16-4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E16-8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E16_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E20_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E20s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E2_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E32-16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E32-8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E32_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E32s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E4-2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E4_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64-16s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64-32s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E64i_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E64is_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E64s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E8-2s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E8-4s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_E8_v3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_E8s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F16": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F16s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F16s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F1s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F2s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F2s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F32s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F4s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F4s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F64s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F72s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F8": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_F8s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_F8s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_G1": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G2": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G3": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G4": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_G5": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_GS1": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS4": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS4-4": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS4-8": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS5": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS5-16": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_GS5-8": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_H16": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16mr": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H16r": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H8": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_H8m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_HB60rs": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_HC44rs": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L16s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L16s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L32s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L32s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L4s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L64s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L80s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L8s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_L8s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M128-32ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128-64ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M128ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M128s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M16-4ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M16-8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M16ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32-16ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32-8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32ls": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M32ts": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M64-16ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64-32ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64ls": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64m": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_M64ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M64s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M8-2ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M8-4ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_M8ms": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC12": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC12s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC12s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC24r": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC24rs_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24rs_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC24s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC6": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NC6s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NC6s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND12s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND24rs": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND24s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_ND6s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV12": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV12s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV12s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV24": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV24s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV24s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV48s_v3": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_NV6": map[string]interface{}{"storageAccountType": "Standard_LRS"}, "Standard_NV6s_v2": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_PB12s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_PB24s": map[string]interface{}{"storageAccountType": "Premium_LRS"}, "Standard_PB6s": map[string]interface{}{"storageAccountType": "Premium_LRS"}} expectedMap["vmsPerStorageAccount"] = 20 expectedMap["vnetID"] = "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]" expectedMap["vnetSubnetID"] = "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]" diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 2ea599496..50f9e4558 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -445,65 +445,50 @@ func TestIsNSeriesSKU(t *testing.T) { "Standard_B8ms", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", "Standard_D8s_v3", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16_v3", "Standard_E16s_v3", "Standard_E2_v3", diff --git a/pkg/engine/transform/transformtestfiles/dcos_scale_template.json b/pkg/engine/transform/transformtestfiles/dcos_scale_template.json index ff28fc482..a71d5d441 100644 --- a/pkg/engine/transform/transformtestfiles/dcos_scale_template.json +++ b/pkg/engine/transform/transformtestfiles/dcos_scale_template.json @@ -138,52 +138,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -365,52 +349,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -510,37 +478,26 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F8", "Standard_G1", diff --git a/pkg/engine/transform/transformtestfiles/dcos_template.json b/pkg/engine/transform/transformtestfiles/dcos_template.json index 59d94ec05..3d9cc4460 100644 --- a/pkg/engine/transform/transformtestfiles/dcos_template.json +++ b/pkg/engine/transform/transformtestfiles/dcos_template.json @@ -138,52 +138,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -365,52 +349,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -510,37 +478,26 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F8", "Standard_G1", diff --git a/pkg/engine/transform/transformtestfiles/k8s_agent_upgrade_template.json b/pkg/engine/transform/transformtestfiles/k8s_agent_upgrade_template.json index ffb7f4cdd..ff9d94b01 100644 --- a/pkg/engine/transform/transformtestfiles/k8s_agent_upgrade_template.json +++ b/pkg/engine/transform/transformtestfiles/k8s_agent_upgrade_template.json @@ -251,55 +251,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -596,55 +580,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -962,52 +930,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -1380,36 +1332,24 @@ "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -1422,33 +1362,21 @@ "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D3": { "storageAccountType": "Standard_LRS" }, "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_DS1": { "storageAccountType": "Premium_LRS" }, @@ -1458,36 +1386,24 @@ "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -1500,33 +1416,21 @@ "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_F1": { "storageAccountType": "Standard_LRS" }, @@ -2035,4 +1939,4 @@ "value": "[reference(concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))).dnsSettings.fqdn]" } } -} +} \ No newline at end of file diff --git a/pkg/engine/transform/transformtestfiles/k8s_master_upgrade_template.json b/pkg/engine/transform/transformtestfiles/k8s_master_upgrade_template.json index bc40a6262..be9d3f0c3 100644 --- a/pkg/engine/transform/transformtestfiles/k8s_master_upgrade_template.json +++ b/pkg/engine/transform/transformtestfiles/k8s_master_upgrade_template.json @@ -251,55 +251,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -596,55 +580,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -971,52 +939,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -1380,36 +1332,24 @@ "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -1422,33 +1362,21 @@ "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D3": { "storageAccountType": "Standard_LRS" }, "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_DS1": { "storageAccountType": "Premium_LRS" }, @@ -1458,36 +1386,24 @@ "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -1500,33 +1416,21 @@ "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_F1": { "storageAccountType": "Standard_LRS" }, @@ -2251,4 +2155,4 @@ "value": "[reference(concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))).dnsSettings.fqdn]" } } -} +} \ No newline at end of file diff --git a/pkg/engine/transform/transformtestfiles/k8s_scale_template.json b/pkg/engine/transform/transformtestfiles/k8s_scale_template.json index b70450bab..b751284e9 100644 --- a/pkg/engine/transform/transformtestfiles/k8s_scale_template.json +++ b/pkg/engine/transform/transformtestfiles/k8s_scale_template.json @@ -251,55 +251,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -596,55 +580,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -962,52 +930,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -1380,36 +1332,24 @@ "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -1422,33 +1362,21 @@ "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D3": { "storageAccountType": "Standard_LRS" }, "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_DS1": { "storageAccountType": "Premium_LRS" }, @@ -1458,36 +1386,24 @@ "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -1500,33 +1416,21 @@ "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_F1": { "storageAccountType": "Standard_LRS" }, @@ -2217,4 +2121,4 @@ "value": "[reference(concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))).dnsSettings.fqdn]" } } -} +} \ No newline at end of file diff --git a/pkg/engine/transform/transformtestfiles/k8s_template.json b/pkg/engine/transform/transformtestfiles/k8s_template.json index de30b66dd..4803ff64f 100644 --- a/pkg/engine/transform/transformtestfiles/k8s_template.json +++ b/pkg/engine/transform/transformtestfiles/k8s_template.json @@ -251,55 +251,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -596,55 +580,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -971,52 +939,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -1380,36 +1332,24 @@ "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -1422,33 +1362,21 @@ "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D3": { "storageAccountType": "Standard_LRS" }, "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_DS1": { "storageAccountType": "Premium_LRS" }, @@ -1458,36 +1386,24 @@ "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -1500,33 +1416,21 @@ "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_F1": { "storageAccountType": "Standard_LRS" }, @@ -2342,4 +2246,4 @@ "value": "[reference(concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))).dnsSettings.fqdn]" } } -} +} \ No newline at end of file diff --git a/pkg/engine/transform/transformtestfiles/k8s_vnet_scale_template.json b/pkg/engine/transform/transformtestfiles/k8s_vnet_scale_template.json index 75ea17984..39051518f 100644 --- a/pkg/engine/transform/transformtestfiles/k8s_vnet_scale_template.json +++ b/pkg/engine/transform/transformtestfiles/k8s_vnet_scale_template.json @@ -244,55 +244,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -588,55 +572,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -953,52 +921,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -1374,36 +1326,24 @@ "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -1416,33 +1356,21 @@ "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D3": { "storageAccountType": "Standard_LRS" }, "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_DS1": { "storageAccountType": "Premium_LRS" }, @@ -1452,36 +1380,24 @@ "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -1494,33 +1410,21 @@ "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_F1": { "storageAccountType": "Standard_LRS" }, @@ -2161,4 +2065,4 @@ "value": "[reference(concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))).dnsSettings.fqdn]" } } -} +} \ No newline at end of file diff --git a/pkg/engine/transform/transformtestfiles/k8s_vnet_template.json b/pkg/engine/transform/transformtestfiles/k8s_vnet_template.json index da978a4bd..b0ee60a19 100644 --- a/pkg/engine/transform/transformtestfiles/k8s_vnet_template.json +++ b/pkg/engine/transform/transformtestfiles/k8s_vnet_template.json @@ -244,55 +244,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -588,55 +572,39 @@ "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS1", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F1", "Standard_F16", "Standard_F16s", @@ -962,52 +930,36 @@ "Standard_A9", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_DS11", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_F2", @@ -1374,36 +1326,24 @@ "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -1416,33 +1356,21 @@ "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D3": { "storageAccountType": "Standard_LRS" }, "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_DS1": { "storageAccountType": "Premium_LRS" }, @@ -1452,36 +1380,24 @@ "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -1494,33 +1410,21 @@ "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_F1": { "storageAccountType": "Standard_LRS" }, @@ -2252,4 +2156,4 @@ "value": "[reference(concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))).dnsSettings.fqdn]" } } -} +} \ No newline at end of file diff --git a/pkg/helpers/azureconst.go b/pkg/helpers/azureconst.go index b3f610186..99432cfe4 100644 --- a/pkg/helpers/azureconst.go +++ b/pkg/helpers/azureconst.go @@ -88,36 +88,28 @@ func GetDCOSMasterAllowedSizes() string { "Standard_B8ms", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", @@ -127,31 +119,24 @@ func GetDCOSMasterAllowedSizes() string { "Standard_DS11", "Standard_DS11-1_v2", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12-1_v2", "Standard_DS12-2_v2", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16-4s_v3", "Standard_E16-8s_v3", "Standard_E16_v3", @@ -206,17 +191,11 @@ func GetDCOSMasterAllowedSizes() string { "Standard_GS5-16", "Standard_GS5-8", "Standard_H16", - "Standard_H16_Promo", "Standard_H16m", - "Standard_H16m_Promo", "Standard_H16mr", - "Standard_H16mr_Promo", "Standard_H16r", - "Standard_H16r_Promo", "Standard_H8", - "Standard_H8_Promo", "Standard_H8m", - "Standard_H8m_Promo", "Standard_HB60rs", "Standard_HC44rs", "Standard_L16s", @@ -253,19 +232,15 @@ func GetDCOSMasterAllowedSizes() string { "Standard_M8-4ms", "Standard_M8ms", "Standard_NC12", - "Standard_NC12_Promo", "Standard_NC12s_v2", "Standard_NC12s_v3", "Standard_NC24", - "Standard_NC24_Promo", "Standard_NC24r", - "Standard_NC24r_Promo", "Standard_NC24rs_v2", "Standard_NC24rs_v3", "Standard_NC24s_v2", "Standard_NC24s_v3", "Standard_NC6", - "Standard_NC6_Promo", "Standard_NC6s_v2", "Standard_NC6s_v3", "Standard_ND12s", @@ -273,16 +248,13 @@ func GetDCOSMasterAllowedSizes() string { "Standard_ND24s", "Standard_ND6s", "Standard_NV12", - "Standard_NV12_Promo", "Standard_NV12s_v2", "Standard_NV12s_v3", "Standard_NV24", - "Standard_NV24_Promo", "Standard_NV24s_v2", "Standard_NV24s_v3", "Standard_NV48s_v3", "Standard_NV6", - "Standard_NV6_Promo", "Standard_NV6s_v2", "Standard_PB12s", "Standard_PB24s", @@ -323,37 +295,29 @@ func GetKubernetesAllowedSizes() string { "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", @@ -364,35 +328,27 @@ func GetKubernetesAllowedSizes() string { "Standard_DS11", "Standard_DS11-1_v2", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12-1_v2", "Standard_DS12-2_v2", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16-4s_v3", "Standard_E16-8s_v3", "Standard_E16_v3", @@ -450,17 +406,11 @@ func GetKubernetesAllowedSizes() string { "Standard_GS5-16", "Standard_GS5-8", "Standard_H16", - "Standard_H16_Promo", "Standard_H16m", - "Standard_H16m_Promo", "Standard_H16mr", - "Standard_H16mr_Promo", "Standard_H16r", - "Standard_H16r_Promo", "Standard_H8", - "Standard_H8_Promo", "Standard_H8m", - "Standard_H8m_Promo", "Standard_HB60rs", "Standard_HC44rs", "Standard_L16s", @@ -497,19 +447,15 @@ func GetKubernetesAllowedSizes() string { "Standard_M8-4ms", "Standard_M8ms", "Standard_NC12", - "Standard_NC12_Promo", "Standard_NC12s_v2", "Standard_NC12s_v3", "Standard_NC24", - "Standard_NC24_Promo", "Standard_NC24r", - "Standard_NC24r_Promo", "Standard_NC24rs_v2", "Standard_NC24rs_v3", "Standard_NC24s_v2", "Standard_NC24s_v3", "Standard_NC6", - "Standard_NC6_Promo", "Standard_NC6s_v2", "Standard_NC6s_v3", "Standard_ND12s", @@ -517,16 +463,13 @@ func GetKubernetesAllowedSizes() string { "Standard_ND24s", "Standard_ND6s", "Standard_NV12", - "Standard_NV12_Promo", "Standard_NV12s_v2", "Standard_NV12s_v3", "Standard_NV24", - "Standard_NV24_Promo", "Standard_NV24s_v2", "Standard_NV24s_v3", "Standard_NV48s_v3", "Standard_NV6", - "Standard_NV6_Promo", "Standard_NV6s_v2", "Standard_PB12s", "Standard_PB24s", @@ -625,36 +568,24 @@ func GetSizeMap() string { "Standard_D11_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D11_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D12": { "storageAccountType": "Standard_LRS" }, "Standard_D12_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D12_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D13": { "storageAccountType": "Standard_LRS" }, "Standard_D13_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D13_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D14": { "storageAccountType": "Standard_LRS" }, "Standard_D14_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D14_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D15_v2": { "storageAccountType": "Standard_LRS" }, @@ -673,9 +604,6 @@ func GetSizeMap() string { "Standard_D2_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D2_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D2_v3": { "storageAccountType": "Standard_LRS" }, @@ -694,18 +622,12 @@ func GetSizeMap() string { "Standard_D3_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D3_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4": { "storageAccountType": "Standard_LRS" }, "Standard_D4_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D4_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D4_v3": { "storageAccountType": "Standard_LRS" }, @@ -715,9 +637,6 @@ func GetSizeMap() string { "Standard_D5_v2": { "storageAccountType": "Standard_LRS" }, - "Standard_D5_v2_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_D64_v3": { "storageAccountType": "Standard_LRS" }, @@ -748,9 +667,6 @@ func GetSizeMap() string { "Standard_DS11_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS11_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS12": { "storageAccountType": "Premium_LRS" }, @@ -763,9 +679,6 @@ func GetSizeMap() string { "Standard_DS12_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS12_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS13": { "storageAccountType": "Premium_LRS" }, @@ -778,9 +691,6 @@ func GetSizeMap() string { "Standard_DS13_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS13_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS14": { "storageAccountType": "Premium_LRS" }, @@ -793,9 +703,6 @@ func GetSizeMap() string { "Standard_DS14_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS14_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS15_v2": { "storageAccountType": "Premium_LRS" }, @@ -808,33 +715,21 @@ func GetSizeMap() string { "Standard_DS2_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS2_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS3": { "storageAccountType": "Premium_LRS" }, "Standard_DS3_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS3_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS4": { "storageAccountType": "Premium_LRS" }, "Standard_DS4_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS4_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_DS5_v2": { "storageAccountType": "Premium_LRS" }, - "Standard_DS5_v2_Promo": { - "storageAccountType": "Premium_LRS" - }, "Standard_E16-4s_v3": { "storageAccountType": "Premium_LRS" }, @@ -1006,39 +901,21 @@ func GetSizeMap() string { "Standard_H16": { "storageAccountType": "Standard_LRS" }, - "Standard_H16_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_H16m": { "storageAccountType": "Standard_LRS" }, - "Standard_H16m_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_H16mr": { "storageAccountType": "Standard_LRS" }, - "Standard_H16mr_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_H16r": { "storageAccountType": "Standard_LRS" }, - "Standard_H16r_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_H8": { "storageAccountType": "Standard_LRS" }, - "Standard_H8_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_H8m": { "storageAccountType": "Standard_LRS" }, - "Standard_H8m_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_HB60rs": { "storageAccountType": "Premium_LRS" }, @@ -1147,9 +1024,6 @@ func GetSizeMap() string { "Standard_NC12": { "storageAccountType": "Standard_LRS" }, - "Standard_NC12_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NC12s_v2": { "storageAccountType": "Premium_LRS" }, @@ -1159,15 +1033,9 @@ func GetSizeMap() string { "Standard_NC24": { "storageAccountType": "Standard_LRS" }, - "Standard_NC24_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NC24r": { "storageAccountType": "Standard_LRS" }, - "Standard_NC24r_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NC24rs_v2": { "storageAccountType": "Premium_LRS" }, @@ -1183,9 +1051,6 @@ func GetSizeMap() string { "Standard_NC6": { "storageAccountType": "Standard_LRS" }, - "Standard_NC6_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NC6s_v2": { "storageAccountType": "Premium_LRS" }, @@ -1207,9 +1072,6 @@ func GetSizeMap() string { "Standard_NV12": { "storageAccountType": "Standard_LRS" }, - "Standard_NV12_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NV12s_v2": { "storageAccountType": "Premium_LRS" }, @@ -1219,9 +1081,6 @@ func GetSizeMap() string { "Standard_NV24": { "storageAccountType": "Standard_LRS" }, - "Standard_NV24_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NV24s_v2": { "storageAccountType": "Premium_LRS" }, @@ -1234,9 +1093,6 @@ func GetSizeMap() string { "Standard_NV6": { "storageAccountType": "Standard_LRS" }, - "Standard_NV6_Promo": { - "storageAccountType": "Standard_LRS" - }, "Standard_NV6s_v2": { "storageAccountType": "Premium_LRS" }, diff --git a/pkg/helpers/azureconst_test.go b/pkg/helpers/azureconst_test.go index 580c33483..8a27a1ca5 100644 --- a/pkg/helpers/azureconst_test.go +++ b/pkg/helpers/azureconst_test.go @@ -101,36 +101,28 @@ func TestGetDCOSMasterAllowedSizes(t *testing.T) { "Standard_B8ms", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", @@ -140,31 +132,24 @@ func TestGetDCOSMasterAllowedSizes(t *testing.T) { "Standard_DS11", "Standard_DS11-1_v2", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12-1_v2", "Standard_DS12-2_v2", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16-4s_v3", "Standard_E16-8s_v3", "Standard_E16_v3", @@ -329,37 +314,29 @@ func TestKubernetesAllowedSizes(t *testing.T) { "Standard_D1", "Standard_D11", "Standard_D11_v2", - "Standard_D11_v2_Promo", "Standard_D12", "Standard_D12_v2", - "Standard_D12_v2_Promo", "Standard_D13", "Standard_D13_v2", - "Standard_D13_v2_Promo", "Standard_D14", "Standard_D14_v2", - "Standard_D14_v2_Promo", "Standard_D15_v2", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D1_v2", "Standard_D2", "Standard_D2_v2", - "Standard_D2_v2_Promo", "Standard_D2_v3", "Standard_D2s_v3", "Standard_D3", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D3_v2", - "Standard_D3_v2_Promo", "Standard_D4", "Standard_D4_v2", - "Standard_D4_v2_Promo", "Standard_D4_v3", "Standard_D4s_v3", "Standard_D5_v2", - "Standard_D5_v2_Promo", "Standard_D64_v3", "Standard_D64s_v3", "Standard_D8_v3", @@ -370,35 +347,27 @@ func TestKubernetesAllowedSizes(t *testing.T) { "Standard_DS11", "Standard_DS11-1_v2", "Standard_DS11_v2", - "Standard_DS11_v2_Promo", "Standard_DS12", "Standard_DS12-1_v2", "Standard_DS12-2_v2", "Standard_DS12_v2", - "Standard_DS12_v2_Promo", "Standard_DS13", "Standard_DS13-2_v2", "Standard_DS13-4_v2", "Standard_DS13_v2", - "Standard_DS13_v2_Promo", "Standard_DS14", "Standard_DS14-4_v2", "Standard_DS14-8_v2", "Standard_DS14_v2", - "Standard_DS14_v2_Promo", "Standard_DS15_v2", "Standard_DS1_v2", "Standard_DS2", "Standard_DS2_v2", - "Standard_DS2_v2_Promo", "Standard_DS3", "Standard_DS3_v2", - "Standard_DS3_v2_Promo", "Standard_DS4", "Standard_DS4_v2", - "Standard_DS4_v2_Promo", "Standard_DS5_v2", - "Standard_DS5_v2_Promo", "Standard_E16-4s_v3", "Standard_E16-8s_v3", "Standard_E16_v3", @@ -619,36 +588,24 @@ func TestGetSizeMap(t *testing.T) { "Standard_D11_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D11_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D12": map[string]string{ "storageAccountType": "Standard_LRS", }, "Standard_D12_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D12_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D13": map[string]string{ "storageAccountType": "Standard_LRS", }, "Standard_D13_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D13_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D14": map[string]string{ "storageAccountType": "Standard_LRS", }, "Standard_D14_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D14_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D15_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, @@ -667,9 +624,6 @@ func TestGetSizeMap(t *testing.T) { "Standard_D2_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D2_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D2_v3": map[string]string{ "storageAccountType": "Standard_LRS", }, @@ -688,18 +642,12 @@ func TestGetSizeMap(t *testing.T) { "Standard_D3_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D3_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D4": map[string]string{ "storageAccountType": "Standard_LRS", }, "Standard_D4_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D4_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D4_v3": map[string]string{ "storageAccountType": "Standard_LRS", }, @@ -709,9 +657,6 @@ func TestGetSizeMap(t *testing.T) { "Standard_D5_v2": map[string]string{ "storageAccountType": "Standard_LRS", }, - "Standard_D5_v2_Promo": map[string]string{ - "storageAccountType": "Standard_LRS", - }, "Standard_D64_v3": map[string]string{ "storageAccountType": "Standard_LRS", }, @@ -742,9 +687,6 @@ func TestGetSizeMap(t *testing.T) { "Standard_DS11_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS11_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS12": map[string]string{ "storageAccountType": "Premium_LRS", }, @@ -757,9 +699,6 @@ func TestGetSizeMap(t *testing.T) { "Standard_DS12_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS12_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS13": map[string]string{ "storageAccountType": "Premium_LRS", }, @@ -772,9 +711,6 @@ func TestGetSizeMap(t *testing.T) { "Standard_DS13_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS13_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS14": map[string]string{ "storageAccountType": "Premium_LRS", }, @@ -787,9 +723,6 @@ func TestGetSizeMap(t *testing.T) { "Standard_DS14_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS14_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS15_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, @@ -802,33 +735,21 @@ func TestGetSizeMap(t *testing.T) { "Standard_DS2_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS2_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS3": map[string]string{ "storageAccountType": "Premium_LRS", }, "Standard_DS3_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS3_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS4": map[string]string{ "storageAccountType": "Premium_LRS", }, "Standard_DS4_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS4_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_DS5_v2": map[string]string{ "storageAccountType": "Premium_LRS", }, - "Standard_DS5_v2_Promo": map[string]string{ - "storageAccountType": "Premium_LRS", - }, "Standard_E16-4s_v3": map[string]string{ "storageAccountType": "Premium_LRS", }, diff --git a/pkg/helpers/generate_azure_constants.py b/pkg/helpers/generate_azure_constants.py index da48bc229..51330b892 100755 --- a/pkg/helpers/generate_azure_constants.py +++ b/pkg/helpers/generate_azure_constants.py @@ -17,7 +17,7 @@ def get_all_sizes(): # NOTE: "az vm list-sizes" fails in francesouth, australiacentral, australiacentral2, and southafricawest. sizes = json.loads(subprocess.check_output(['az', 'vm', 'list-sizes', '-l', location['name'], '-o', 'json']).decode('utf-8')) for size in sizes: - if not size['name'] in size_map and not size['name'].split('_')[0] == 'Basic': + if not size['name'] in size_map and not size['name'].split('_')[0] == 'Basic' and not size['name'][-6:] == '_Promo': size_map[size['name']] = size except subprocess.CalledProcessError: continue diff --git a/pkg/helpers/helpers.go b/pkg/helpers/helpers.go index 691236288..47e5e023f 100644 --- a/pkg/helpers/helpers.go +++ b/pkg/helpers/helpers.go @@ -116,26 +116,21 @@ func CreateSSH(rg io.Reader, s *i18n.Translator) (privateKey *rsa.PrivateKey, pu // AcceleratedNetworkingSupported check if the VmSKU support the Accelerated Networking func AcceleratedNetworkingSupported(sku string) bool { + // Trim the optional _Promo suffix. + sku = strings.TrimSuffix(sku, "_Promo") switch sku { - case "Standard_D3_v2", "Standard_D12_v2", "Standard_D3_v2_Promo", "Standard_D12_v2_Promo", - "Standard_DS3_v2", "Standard_DS12_v2", "Standard_DS13-4_v2", "Standard_DS14-4_v2", - "Standard_DS3_v2_Promo", "Standard_DS12_v2_Promo", "Standard_DS13-4_v2_Promo", - "Standard_DS14-4_v2_Promo", "Standard_F4", "Standard_F4s", "Standard_D8_v3", "Standard_D8s_v3", + case "Standard_D3_v2", "Standard_D12_v2", "Standard_DS13-4_v2", "Standard_DS14-4_v2", "Standard_F4", "Standard_F4s", "Standard_D8_v3", "Standard_D8s_v3", "Standard_D32-8s_v3", "Standard_E8_v3", "Standard_E8s_v3", "Standard_D3_v2_ABC", "Standard_D12_v2_ABC", "Standard_F4_ABC", "Standard_F8s_v2", "Standard_D4_v2", - "Standard_D13_v2", "Standard_D4_v2_Promo", "Standard_D13_v2_Promo", "Standard_DS4_v2", - "Standard_DS13_v2", "Standard_DS14-8_v2", "Standard_DS4_v2_Promo", "Standard_DS13_v2_Promo", - "Standard_DS14-8_v2_Promo", "Standard_F8", "Standard_F8s", "Standard_M64-16ms", "Standard_D16_v3", + "Standard_D13_v2", "Standard_DS4_v2", + "Standard_DS13_v2", "Standard_DS14-8_v2", "Standard_F8s", "Standard_M64-16ms", "Standard_D16_v3", "Standard_D16s_v3", "Standard_D32-16s_v3", "Standard_D64-16s_v3", "Standard_E16_v3", "Standard_E16s_v3", "Standard_E32-16s_v3", "Standard_D4_v2_ABC", "Standard_D13_v2_ABC", - "Standard_F8_ABC", "Standard_F16s_v2", "Standard_D5_v2", "Standard_D14_v2", "Standard_D5_v2_Promo", - "Standard_D14_v2_Promo", "Standard_DS5_v2", "Standard_DS14_v2", "Standard_DS5_v2_Promo", - "Standard_DS14_v2_Promo", "Standard_F16", "Standard_F16s", "Standard_M64-32ms", + "Standard_F8_ABC", "Standard_F16s_v2", "Standard_D5_v2", "Standard_D14_v2", "Standard_DS5_v2", "Standard_DS14_v2", "Standard_F16", "Standard_F16s", "Standard_M64-32ms", "Standard_M128-32ms", "Standard_D32_v3", "Standard_D32s_v3", "Standard_D64-32s_v3", "Standard_E32_v3", "Standard_E32s_v3", "Standard_E32-8s_v3", "Standard_E32-16_v3", "Standard_D5_v2_ABC", "Standard_D14_v2_ABC", "Standard_F16_ABC", "Standard_F32s_v2", - "Standard_D15_v2", "Standard_D15_v2_Promo", "Standard_D15_v2_Nested", "Standard_DS15_v2", - "Standard_DS15_v2_Promo", "Standard_DS15_v2_Nested", "Standard_D40_v3", "Standard_D40s_v3", + "Standard_D15_v2", "Standard_DS15_v2", "Standard_D40_v3", "Standard_D40s_v3", "Standard_D15_v2_ABC", "Standard_M64ms", "Standard_M64s", "Standard_M128-64ms", "Standard_D64_v3", "Standard_D64s_v3", "Standard_E64_v3", "Standard_E64s_v3", "Standard_E64-16s_v3", "Standard_E64-32s_v3", "Standard_F64s_v2", "Standard_F72s_v2", "Standard_M128s", "Standard_M128ms",