diff --git a/cluster-autoscaler/cloudprovider/azure/azure_instance_types.go b/cluster-autoscaler/cloudprovider/azure/azure_instance_types.go index ad59da295ba4..8a97fbdd6757 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_instance_types.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_instance_types.go @@ -328,6 +328,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 65536, GPU: 0, }, + "Standard_D16_v5": { + InstanceType: "Standard_D16_v5", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, "Standard_D16a_v3": { InstanceType: "Standard_D16a_v3", VCPU: 16, @@ -340,6 +346,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 65536, GPU: 0, }, + "Standard_D16ads_v5": { + InstanceType: "Standard_D16ads_v5", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, "Standard_D16as_v3": { InstanceType: "Standard_D16as_v3", VCPU: 16, @@ -352,18 +364,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 65536, GPU: 0, }, + "Standard_D16as_v5": { + InstanceType: "Standard_D16as_v5", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, "Standard_D16d_v4": { InstanceType: "Standard_D16d_v4", VCPU: 16, MemoryMb: 65536, GPU: 0, }, + "Standard_D16d_v5": { + InstanceType: "Standard_D16d_v5", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, "Standard_D16ds_v4": { InstanceType: "Standard_D16ds_v4", VCPU: 16, MemoryMb: 65536, GPU: 0, }, + "Standard_D16ds_v5": { + InstanceType: "Standard_D16ds_v5", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, "Standard_D16s_v3": { InstanceType: "Standard_D16s_v3", VCPU: 16, @@ -376,6 +406,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 65536, GPU: 0, }, + "Standard_D16s_v5": { + InstanceType: "Standard_D16s_v5", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, "Standard_D1_v2": { InstanceType: "Standard_D1_v2", VCPU: 1, @@ -412,6 +448,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 8192, GPU: 0, }, + "Standard_D2_v5": { + InstanceType: "Standard_D2_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, "Standard_D2a_v3": { InstanceType: "Standard_D2a_v3", VCPU: 2, @@ -424,6 +466,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 8192, GPU: 0, }, + "Standard_D2ads_v5": { + InstanceType: "Standard_D2ads_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, "Standard_D2as_v3": { InstanceType: "Standard_D2as_v3", VCPU: 2, @@ -436,18 +484,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 8192, GPU: 0, }, + "Standard_D2as_v5": { + InstanceType: "Standard_D2as_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, "Standard_D2d_v4": { InstanceType: "Standard_D2d_v4", VCPU: 2, MemoryMb: 8192, GPU: 0, }, + "Standard_D2d_v5": { + InstanceType: "Standard_D2d_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, "Standard_D2ds_v4": { InstanceType: "Standard_D2ds_v4", VCPU: 2, MemoryMb: 8192, GPU: 0, }, + "Standard_D2ds_v5": { + InstanceType: "Standard_D2ds_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, "Standard_D2s_v3": { InstanceType: "Standard_D2s_v3", VCPU: 2, @@ -460,6 +526,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 8192, GPU: 0, }, + "Standard_D2s_v5": { + InstanceType: "Standard_D2s_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, "Standard_D3": { InstanceType: "Standard_D3", VCPU: 4, @@ -478,6 +550,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_D32_v5": { + InstanceType: "Standard_D32_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, "Standard_D32a_v3": { InstanceType: "Standard_D32a_v3", VCPU: 32, @@ -490,6 +568,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_D32ads_v5": { + InstanceType: "Standard_D32ads_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, "Standard_D32as_v3": { InstanceType: "Standard_D32as_v3", VCPU: 32, @@ -502,18 +586,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_D32as_v5": { + InstanceType: "Standard_D32as_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, "Standard_D32d_v4": { InstanceType: "Standard_D32d_v4", VCPU: 32, MemoryMb: 131072, GPU: 0, }, + "Standard_D32d_v5": { + InstanceType: "Standard_D32d_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, "Standard_D32ds_v4": { InstanceType: "Standard_D32ds_v4", VCPU: 32, MemoryMb: 131072, GPU: 0, }, + "Standard_D32ds_v5": { + InstanceType: "Standard_D32ds_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, "Standard_D32s_v3": { InstanceType: "Standard_D32s_v3", VCPU: 32, @@ -526,6 +628,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_D32s_v5": { + InstanceType: "Standard_D32s_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, "Standard_D3_v2": { InstanceType: "Standard_D3_v2", VCPU: 4, @@ -556,6 +664,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 196608, GPU: 0, }, + "Standard_D48_v5": { + InstanceType: "Standard_D48_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, "Standard_D48a_v3": { InstanceType: "Standard_D48a_v3", VCPU: 48, @@ -568,6 +682,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 196608, GPU: 0, }, + "Standard_D48ads_v5": { + InstanceType: "Standard_D48ads_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, "Standard_D48as_v3": { InstanceType: "Standard_D48as_v3", VCPU: 48, @@ -580,18 +700,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 196608, GPU: 0, }, + "Standard_D48as_v5": { + InstanceType: "Standard_D48as_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, "Standard_D48d_v4": { InstanceType: "Standard_D48d_v4", VCPU: 48, MemoryMb: 196608, GPU: 0, }, + "Standard_D48d_v5": { + InstanceType: "Standard_D48d_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, "Standard_D48ds_v4": { InstanceType: "Standard_D48ds_v4", VCPU: 48, MemoryMb: 196608, GPU: 0, }, + "Standard_D48ds_v5": { + InstanceType: "Standard_D48ds_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, "Standard_D48s_v3": { InstanceType: "Standard_D48s_v3", VCPU: 48, @@ -604,6 +742,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 196608, GPU: 0, }, + "Standard_D48s_v5": { + InstanceType: "Standard_D48s_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, "Standard_D4_v2": { InstanceType: "Standard_D4_v2", VCPU: 8, @@ -628,6 +772,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_D4_v5": { + InstanceType: "Standard_D4_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "Standard_D4a_v3": { InstanceType: "Standard_D4a_v3", VCPU: 4, @@ -640,6 +790,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_D4ads_v5": { + InstanceType: "Standard_D4ads_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "Standard_D4as_v3": { InstanceType: "Standard_D4as_v3", VCPU: 4, @@ -652,18 +808,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_D4as_v5": { + InstanceType: "Standard_D4as_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "Standard_D4d_v4": { InstanceType: "Standard_D4d_v4", VCPU: 4, MemoryMb: 16384, GPU: 0, }, + "Standard_D4d_v5": { + InstanceType: "Standard_D4d_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "Standard_D4ds_v4": { InstanceType: "Standard_D4ds_v4", VCPU: 4, MemoryMb: 16384, GPU: 0, }, + "Standard_D4ds_v5": { + InstanceType: "Standard_D4ds_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "Standard_D4s_v3": { InstanceType: "Standard_D4s_v3", VCPU: 4, @@ -676,6 +850,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_D4s_v5": { + InstanceType: "Standard_D4s_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "Standard_D5_v2": { InstanceType: "Standard_D5_v2", VCPU: 16, @@ -700,6 +880,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_D64_v5": { + InstanceType: "Standard_D64_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, "Standard_D64a_v3": { InstanceType: "Standard_D64a_v3", VCPU: 64, @@ -712,6 +898,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_D64ads_v5": { + InstanceType: "Standard_D64ads_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, "Standard_D64as_v3": { InstanceType: "Standard_D64as_v3", VCPU: 64, @@ -724,18 +916,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_D64as_v5": { + InstanceType: "Standard_D64as_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, "Standard_D64d_v4": { InstanceType: "Standard_D64d_v4", VCPU: 64, MemoryMb: 262144, GPU: 0, }, + "Standard_D64d_v5": { + InstanceType: "Standard_D64d_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, "Standard_D64ds_v4": { InstanceType: "Standard_D64ds_v4", VCPU: 64, MemoryMb: 262144, GPU: 0, }, + "Standard_D64ds_v5": { + InstanceType: "Standard_D64ds_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, "Standard_D64s_v3": { InstanceType: "Standard_D64s_v3", VCPU: 64, @@ -748,6 +958,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_D64s_v5": { + InstanceType: "Standard_D64s_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, "Standard_D8_v3": { InstanceType: "Standard_D8_v3", VCPU: 8, @@ -760,6 +976,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_D8_v5": { + InstanceType: "Standard_D8_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, "Standard_D8a_v3": { InstanceType: "Standard_D8a_v3", VCPU: 8, @@ -772,6 +994,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_D8ads_v5": { + InstanceType: "Standard_D8ads_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, "Standard_D8as_v3": { InstanceType: "Standard_D8as_v3", VCPU: 8, @@ -784,18 +1012,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_D8as_v5": { + InstanceType: "Standard_D8as_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, "Standard_D8d_v4": { InstanceType: "Standard_D8d_v4", VCPU: 8, MemoryMb: 32768, GPU: 0, }, + "Standard_D8d_v5": { + InstanceType: "Standard_D8d_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, "Standard_D8ds_v4": { InstanceType: "Standard_D8ds_v4", VCPU: 8, MemoryMb: 32768, GPU: 0, }, + "Standard_D8ds_v5": { + InstanceType: "Standard_D8ds_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, "Standard_D8s_v3": { InstanceType: "Standard_D8s_v3", VCPU: 8, @@ -808,94 +1054,328 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_D8s_v5": { + InstanceType: "Standard_D8s_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_D96_v5": { + InstanceType: "Standard_D96_v5", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + }, "Standard_D96a_v4": { InstanceType: "Standard_D96a_v4", VCPU: 96, MemoryMb: 393216, GPU: 0, }, + "Standard_D96ads_v5": { + InstanceType: "Standard_D96ads_v5", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + }, "Standard_D96as_v4": { InstanceType: "Standard_D96as_v4", VCPU: 96, MemoryMb: 393216, GPU: 0, }, - "Standard_DC1s_v2": { - InstanceType: "Standard_DC1s_v2", - VCPU: 1, - MemoryMb: 4096, + "Standard_D96as_v5": { + InstanceType: "Standard_D96as_v5", + VCPU: 96, + MemoryMb: 393216, GPU: 0, }, - "Standard_DC2s": { - InstanceType: "Standard_DC2s", - VCPU: 2, - MemoryMb: 8192, + "Standard_D96d_v5": { + InstanceType: "Standard_D96d_v5", + VCPU: 96, + MemoryMb: 393216, GPU: 0, }, - "Standard_DC2s_v2": { - InstanceType: "Standard_DC2s_v2", - VCPU: 2, - MemoryMb: 8192, + "Standard_D96ds_v5": { + InstanceType: "Standard_D96ds_v5", + VCPU: 96, + MemoryMb: 393216, GPU: 0, }, - "Standard_DC4s": { - InstanceType: "Standard_DC4s", - VCPU: 4, - MemoryMb: 16384, + "Standard_D96s_v5": { + InstanceType: "Standard_D96s_v5", + VCPU: 96, + MemoryMb: 393216, GPU: 0, }, - "Standard_DC4s_v2": { - InstanceType: "Standard_DC4s_v2", - VCPU: 4, - MemoryMb: 16384, + "Standard_DC16ads_v5": { + InstanceType: "Standard_DC16ads_v5", + VCPU: 16, + MemoryMb: 65536, GPU: 0, }, - "Standard_DC8_v2": { - InstanceType: "Standard_DC8_v2", - VCPU: 8, - MemoryMb: 32768, + "Standard_DC16as_v5": { + InstanceType: "Standard_DC16as_v5", + VCPU: 16, + MemoryMb: 65536, GPU: 0, }, - "Standard_DS1": { - InstanceType: "Standard_DS1", - VCPU: 1, - MemoryMb: 3072, + "Standard_DC16ds_v3": { + InstanceType: "Standard_DC16ds_v3", + VCPU: 16, + MemoryMb: 131072, GPU: 0, }, - "Standard_DS11": { - InstanceType: "Standard_DS11", - VCPU: 2, - MemoryMb: 14336, + "Standard_DC16s_v3": { + InstanceType: "Standard_DC16s_v3", + VCPU: 16, + MemoryMb: 131072, GPU: 0, }, - "Standard_DS11-1_v2": { - InstanceType: "Standard_DS11-1_v2", - VCPU: 2, - MemoryMb: 14336, + "Standard_DC1ds_v3": { + InstanceType: "Standard_DC1ds_v3", + VCPU: 1, + MemoryMb: 8192, GPU: 0, }, - "Standard_DS11_v2": { - InstanceType: "Standard_DS11_v2", - VCPU: 2, - MemoryMb: 14336, + "Standard_DC1s_v2": { + InstanceType: "Standard_DC1s_v2", + VCPU: 1, + MemoryMb: 4096, GPU: 0, }, - "Standard_DS11_v2_Promo": { - InstanceType: "Standard_DS11_v2_Promo", - VCPU: 2, - MemoryMb: 14336, + "Standard_DC1s_v3": { + InstanceType: "Standard_DC1s_v3", + VCPU: 1, + MemoryMb: 8192, GPU: 0, }, - "Standard_DS12": { - InstanceType: "Standard_DS12", - VCPU: 4, - MemoryMb: 28672, + "Standard_DC24ds_v3": { + InstanceType: "Standard_DC24ds_v3", + VCPU: 24, + MemoryMb: 196608, GPU: 0, }, - "Standard_DS12-1_v2": { - InstanceType: "Standard_DS12-1_v2", - VCPU: 4, - MemoryMb: 28672, + "Standard_DC24s_v3": { + InstanceType: "Standard_DC24s_v3", + VCPU: 24, + MemoryMb: 196608, + GPU: 0, + }, + "Standard_DC2ads_v5": { + InstanceType: "Standard_DC2ads_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, + "Standard_DC2as_v5": { + InstanceType: "Standard_DC2as_v5", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, + "Standard_DC2ds_v3": { + InstanceType: "Standard_DC2ds_v3", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_DC2s": { + InstanceType: "Standard_DC2s", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, + "Standard_DC2s_v2": { + InstanceType: "Standard_DC2s_v2", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, + "Standard_DC2s_v3": { + InstanceType: "Standard_DC2s_v3", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_DC32ads_v5": { + InstanceType: "Standard_DC32ads_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, + "Standard_DC32as_v5": { + InstanceType: "Standard_DC32as_v5", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, + "Standard_DC32ds_v3": { + InstanceType: "Standard_DC32ds_v3", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, + "Standard_DC32s_v3": { + InstanceType: "Standard_DC32s_v3", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, + "Standard_DC48ads_v5": { + InstanceType: "Standard_DC48ads_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, + "Standard_DC48as_v5": { + InstanceType: "Standard_DC48as_v5", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, + "Standard_DC48ds_v3": { + InstanceType: "Standard_DC48ds_v3", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, + "Standard_DC48s_v3": { + InstanceType: "Standard_DC48s_v3", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, + "Standard_DC4ads_v5": { + InstanceType: "Standard_DC4ads_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_DC4as_v5": { + InstanceType: "Standard_DC4as_v5", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_DC4ds_v3": { + InstanceType: "Standard_DC4ds_v3", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_DC4s": { + InstanceType: "Standard_DC4s", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_DC4s_v2": { + InstanceType: "Standard_DC4s_v2", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_DC4s_v3": { + InstanceType: "Standard_DC4s_v3", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_DC64ads_v5": { + InstanceType: "Standard_DC64ads_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, + "Standard_DC64as_v5": { + InstanceType: "Standard_DC64as_v5", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, + "Standard_DC8_v2": { + InstanceType: "Standard_DC8_v2", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_DC8ads_v5": { + InstanceType: "Standard_DC8ads_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_DC8as_v5": { + InstanceType: "Standard_DC8as_v5", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_DC8ds_v3": { + InstanceType: "Standard_DC8ds_v3", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_DC8s_v3": { + InstanceType: "Standard_DC8s_v3", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_DC96ads_v5": { + InstanceType: "Standard_DC96ads_v5", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + }, + "Standard_DC96as_v5": { + InstanceType: "Standard_DC96as_v5", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + }, + "Standard_DS1": { + InstanceType: "Standard_DS1", + VCPU: 1, + MemoryMb: 3072, + GPU: 0, + }, + "Standard_DS11": { + InstanceType: "Standard_DS11", + VCPU: 2, + MemoryMb: 14336, + GPU: 0, + }, + "Standard_DS11-1_v2": { + InstanceType: "Standard_DS11-1_v2", + VCPU: 2, + MemoryMb: 14336, + GPU: 0, + }, + "Standard_DS11_v2": { + InstanceType: "Standard_DS11_v2", + VCPU: 2, + MemoryMb: 14336, + GPU: 0, + }, + "Standard_DS11_v2_Promo": { + InstanceType: "Standard_DS11_v2_Promo", + VCPU: 2, + MemoryMb: 14336, + GPU: 0, + }, + "Standard_DS12": { + InstanceType: "Standard_DS12", + VCPU: 4, + MemoryMb: 28672, + GPU: 0, + }, + "Standard_DS12-1_v2": { + InstanceType: "Standard_DS12-1_v2", + VCPU: 4, + MemoryMb: 28672, GPU: 0, }, "Standard_DS12-2_v2": { @@ -1054,18 +1534,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 57344, GPU: 0, }, + "Standard_E104i_v5": { + InstanceType: "Standard_E104i_v5", + VCPU: 104, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E104id_v5": { + InstanceType: "Standard_E104id_v5", + VCPU: 104, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E104ids_v5": { + InstanceType: "Standard_E104ids_v5", + VCPU: 104, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E104is_v5": { + InstanceType: "Standard_E104is_v5", + VCPU: 104, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E16-4ads_v5": { + InstanceType: "Standard_E16-4ads_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16-4as_v4": { InstanceType: "Standard_E16-4as_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16-4as_v5": { + InstanceType: "Standard_E16-4as_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16-4ds_v4": { InstanceType: "Standard_E16-4ds_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16-4ds_v5": { + InstanceType: "Standard_E16-4ds_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16-4s_v3": { InstanceType: "Standard_E16-4s_v3", VCPU: 16, @@ -1078,18 +1600,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_E16-4s_v5": { + InstanceType: "Standard_E16-4s_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, + "Standard_E16-8ads_v5": { + InstanceType: "Standard_E16-8ads_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16-8as_v4": { InstanceType: "Standard_E16-8as_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16-8as_v5": { + InstanceType: "Standard_E16-8as_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16-8ds_v4": { InstanceType: "Standard_E16-8ds_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16-8ds_v5": { + InstanceType: "Standard_E16-8ds_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16-8s_v3": { InstanceType: "Standard_E16-8s_v3", VCPU: 16, @@ -1102,6 +1648,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_E16-8s_v5": { + InstanceType: "Standard_E16-8s_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16_v3": { InstanceType: "Standard_E16_v3", VCPU: 16, @@ -1114,30 +1666,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_E16_v5": { + InstanceType: "Standard_E16_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16a_v4": { InstanceType: "Standard_E16a_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16ads_v5": { + InstanceType: "Standard_E16ads_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16as_v4": { InstanceType: "Standard_E16as_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16as_v5": { + InstanceType: "Standard_E16as_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16d_v4": { InstanceType: "Standard_E16d_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16d_v5": { + InstanceType: "Standard_E16d_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16ds_v4": { InstanceType: "Standard_E16ds_v4", VCPU: 16, MemoryMb: 131072, GPU: 0, }, + "Standard_E16ds_v5": { + InstanceType: "Standard_E16ds_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E16s_v3": { InstanceType: "Standard_E16s_v3", VCPU: 16, @@ -1150,6 +1732,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 0, }, + "Standard_E16s_v5": { + InstanceType: "Standard_E16s_v5", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + }, "Standard_E20_v3": { InstanceType: "Standard_E20_v3", VCPU: 20, @@ -1162,30 +1750,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 163840, GPU: 0, }, + "Standard_E20_v5": { + InstanceType: "Standard_E20_v5", + VCPU: 20, + MemoryMb: 163840, + GPU: 0, + }, "Standard_E20a_v4": { InstanceType: "Standard_E20a_v4", VCPU: 20, MemoryMb: 163840, GPU: 0, }, + "Standard_E20ads_v5": { + InstanceType: "Standard_E20ads_v5", + VCPU: 20, + MemoryMb: 163840, + GPU: 0, + }, "Standard_E20as_v4": { InstanceType: "Standard_E20as_v4", VCPU: 20, MemoryMb: 163840, GPU: 0, }, + "Standard_E20as_v5": { + InstanceType: "Standard_E20as_v5", + VCPU: 20, + MemoryMb: 163840, + GPU: 0, + }, "Standard_E20d_v4": { InstanceType: "Standard_E20d_v4", VCPU: 20, MemoryMb: 163840, GPU: 0, }, + "Standard_E20d_v5": { + InstanceType: "Standard_E20d_v5", + VCPU: 20, + MemoryMb: 163840, + GPU: 0, + }, "Standard_E20ds_v4": { InstanceType: "Standard_E20ds_v4", VCPU: 20, MemoryMb: 163840, GPU: 0, }, + "Standard_E20ds_v5": { + InstanceType: "Standard_E20ds_v5", + VCPU: 20, + MemoryMb: 163840, + GPU: 0, + }, "Standard_E20s_v3": { InstanceType: "Standard_E20s_v3", VCPU: 20, @@ -1198,6 +1816,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 163840, GPU: 0, }, + "Standard_E20s_v5": { + InstanceType: "Standard_E20s_v5", + VCPU: 20, + MemoryMb: 163840, + GPU: 0, + }, "Standard_E2_v3": { InstanceType: "Standard_E2_v3", VCPU: 2, @@ -1210,30 +1834,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_E2_v5": { + InstanceType: "Standard_E2_v5", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, "Standard_E2a_v4": { InstanceType: "Standard_E2a_v4", VCPU: 2, MemoryMb: 16384, GPU: 0, }, + "Standard_E2ads_v5": { + InstanceType: "Standard_E2ads_v5", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, "Standard_E2as_v4": { InstanceType: "Standard_E2as_v4", VCPU: 2, MemoryMb: 16384, GPU: 0, }, + "Standard_E2as_v5": { + InstanceType: "Standard_E2as_v5", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, "Standard_E2d_v4": { InstanceType: "Standard_E2d_v4", VCPU: 2, MemoryMb: 16384, GPU: 0, }, + "Standard_E2d_v5": { + InstanceType: "Standard_E2d_v5", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, "Standard_E2ds_v4": { InstanceType: "Standard_E2ds_v4", VCPU: 2, MemoryMb: 16384, GPU: 0, }, + "Standard_E2ds_v5": { + InstanceType: "Standard_E2ds_v5", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, "Standard_E2s_v3": { InstanceType: "Standard_E2s_v3", VCPU: 2, @@ -1246,18 +1900,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_E2s_v5": { + InstanceType: "Standard_E2s_v5", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + }, + "Standard_E32-16ads_v5": { + InstanceType: "Standard_E32-16ads_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32-16as_v4": { InstanceType: "Standard_E32-16as_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32-16as_v5": { + InstanceType: "Standard_E32-16as_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32-16ds_v4": { InstanceType: "Standard_E32-16ds_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32-16ds_v5": { + InstanceType: "Standard_E32-16ds_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32-16s_v3": { InstanceType: "Standard_E32-16s_v3", VCPU: 32, @@ -1270,18 +1948,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_E32-16s_v5": { + InstanceType: "Standard_E32-16s_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, + "Standard_E32-8ads_v5": { + InstanceType: "Standard_E32-8ads_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32-8as_v4": { InstanceType: "Standard_E32-8as_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32-8as_v5": { + InstanceType: "Standard_E32-8as_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32-8ds_v4": { InstanceType: "Standard_E32-8ds_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32-8ds_v5": { + InstanceType: "Standard_E32-8ds_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32-8s_v3": { InstanceType: "Standard_E32-8s_v3", VCPU: 32, @@ -1294,6 +1996,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_E32-8s_v5": { + InstanceType: "Standard_E32-8s_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32_v3": { InstanceType: "Standard_E32_v3", VCPU: 32, @@ -1306,30 +2014,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_E32_v5": { + InstanceType: "Standard_E32_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32a_v4": { InstanceType: "Standard_E32a_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32ads_v5": { + InstanceType: "Standard_E32ads_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32as_v4": { InstanceType: "Standard_E32as_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32as_v5": { + InstanceType: "Standard_E32as_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32d_v4": { InstanceType: "Standard_E32d_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32d_v5": { + InstanceType: "Standard_E32d_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32ds_v4": { InstanceType: "Standard_E32ds_v4", VCPU: 32, MemoryMb: 262144, GPU: 0, }, + "Standard_E32ds_v5": { + InstanceType: "Standard_E32ds_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, "Standard_E32s_v3": { InstanceType: "Standard_E32s_v3", VCPU: 32, @@ -1342,18 +2080,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 262144, GPU: 0, }, + "Standard_E32s_v5": { + InstanceType: "Standard_E32s_v5", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + }, + "Standard_E4-2ads_v5": { + InstanceType: "Standard_E4-2ads_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4-2as_v4": { InstanceType: "Standard_E4-2as_v4", VCPU: 4, MemoryMb: 32768, GPU: 0, }, + "Standard_E4-2as_v5": { + InstanceType: "Standard_E4-2as_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4-2ds_v4": { InstanceType: "Standard_E4-2ds_v4", VCPU: 4, MemoryMb: 32768, GPU: 0, }, + "Standard_E4-2ds_v5": { + InstanceType: "Standard_E4-2ds_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4-2s_v3": { InstanceType: "Standard_E4-2s_v3", VCPU: 4, @@ -1366,6 +2128,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_E4-2s_v5": { + InstanceType: "Standard_E4-2s_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E48_v3": { InstanceType: "Standard_E48_v3", VCPU: 48, @@ -1378,30 +2146,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 393216, GPU: 0, }, + "Standard_E48_v5": { + InstanceType: "Standard_E48_v5", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, "Standard_E48a_v4": { InstanceType: "Standard_E48a_v4", VCPU: 48, MemoryMb: 393216, GPU: 0, }, + "Standard_E48ads_v5": { + InstanceType: "Standard_E48ads_v5", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, "Standard_E48as_v4": { InstanceType: "Standard_E48as_v4", VCPU: 48, MemoryMb: 393216, GPU: 0, }, + "Standard_E48as_v5": { + InstanceType: "Standard_E48as_v5", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, "Standard_E48d_v4": { InstanceType: "Standard_E48d_v4", VCPU: 48, MemoryMb: 393216, GPU: 0, }, + "Standard_E48d_v5": { + InstanceType: "Standard_E48d_v5", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, "Standard_E48ds_v4": { InstanceType: "Standard_E48ds_v4", VCPU: 48, MemoryMb: 393216, GPU: 0, }, + "Standard_E48ds_v5": { + InstanceType: "Standard_E48ds_v5", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, "Standard_E48s_v3": { InstanceType: "Standard_E48s_v3", VCPU: 48, @@ -1414,6 +2212,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 393216, GPU: 0, }, + "Standard_E48s_v5": { + InstanceType: "Standard_E48s_v5", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + }, "Standard_E4_v3": { InstanceType: "Standard_E4_v3", VCPU: 4, @@ -1426,30 +2230,60 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_E4_v5": { + InstanceType: "Standard_E4_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4a_v4": { InstanceType: "Standard_E4a_v4", VCPU: 4, MemoryMb: 32768, GPU: 0, }, + "Standard_E4ads_v5": { + InstanceType: "Standard_E4ads_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4as_v4": { InstanceType: "Standard_E4as_v4", VCPU: 4, MemoryMb: 32768, GPU: 0, }, + "Standard_E4as_v5": { + InstanceType: "Standard_E4as_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4d_v4": { InstanceType: "Standard_E4d_v4", VCPU: 4, MemoryMb: 32768, GPU: 0, }, + "Standard_E4d_v5": { + InstanceType: "Standard_E4d_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4ds_v4": { InstanceType: "Standard_E4ds_v4", VCPU: 4, MemoryMb: 32768, GPU: 0, }, + "Standard_E4ds_v5": { + InstanceType: "Standard_E4ds_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, "Standard_E4s_v3": { InstanceType: "Standard_E4s_v3", VCPU: 4, @@ -1462,18 +2296,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "Standard_E4s_v5": { + InstanceType: "Standard_E4s_v5", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + }, + "Standard_E64-16ads_v5": { + InstanceType: "Standard_E64-16ads_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64-16as_v4": { InstanceType: "Standard_E64-16as_v4", VCPU: 64, MemoryMb: 524288, GPU: 0, }, + "Standard_E64-16as_v5": { + InstanceType: "Standard_E64-16as_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64-16ds_v4": { InstanceType: "Standard_E64-16ds_v4", VCPU: 64, MemoryMb: 516096, GPU: 0, }, + "Standard_E64-16ds_v5": { + InstanceType: "Standard_E64-16ds_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64-16s_v3": { InstanceType: "Standard_E64-16s_v3", VCPU: 64, @@ -1486,18 +2344,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 516096, GPU: 0, }, + "Standard_E64-16s_v5": { + InstanceType: "Standard_E64-16s_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E64-32ads_v5": { + InstanceType: "Standard_E64-32ads_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64-32as_v4": { InstanceType: "Standard_E64-32as_v4", VCPU: 64, MemoryMb: 524288, GPU: 0, }, + "Standard_E64-32as_v5": { + InstanceType: "Standard_E64-32as_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64-32ds_v4": { InstanceType: "Standard_E64-32ds_v4", VCPU: 64, MemoryMb: 516096, GPU: 0, }, + "Standard_E64-32ds_v5": { + InstanceType: "Standard_E64-32ds_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64-32s_v3": { InstanceType: "Standard_E64-32s_v3", VCPU: 64, @@ -1510,6 +2392,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 516096, GPU: 0, }, + "Standard_E64-32s_v5": { + InstanceType: "Standard_E64-32s_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64_v3": { InstanceType: "Standard_E64_v3", VCPU: 64, @@ -1522,182 +2410,506 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 516096, GPU: 0, }, + "Standard_E64_v5": { + InstanceType: "Standard_E64_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, "Standard_E64a_v4": { InstanceType: "Standard_E64a_v4", VCPU: 64, MemoryMb: 524288, GPU: 0, }, - "Standard_E64as_v4": { - InstanceType: "Standard_E64as_v4", - VCPU: 64, - MemoryMb: 524288, + "Standard_E64ads_v5": { + InstanceType: "Standard_E64ads_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E64as_v4": { + InstanceType: "Standard_E64as_v4", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E64as_v5": { + InstanceType: "Standard_E64as_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E64d_v4": { + InstanceType: "Standard_E64d_v4", + VCPU: 64, + MemoryMb: 516096, + GPU: 0, + }, + "Standard_E64d_v5": { + InstanceType: "Standard_E64d_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E64ds_v4": { + InstanceType: "Standard_E64ds_v4", + VCPU: 64, + MemoryMb: 516096, + GPU: 0, + }, + "Standard_E64ds_v5": { + InstanceType: "Standard_E64ds_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E64i_v3": { + InstanceType: "Standard_E64i_v3", + VCPU: 64, + MemoryMb: 442368, + GPU: 0, + }, + "Standard_E64is_v3": { + InstanceType: "Standard_E64is_v3", + VCPU: 64, + MemoryMb: 442368, + GPU: 0, + }, + "Standard_E64s_v3": { + InstanceType: "Standard_E64s_v3", + VCPU: 64, + MemoryMb: 442368, + GPU: 0, + }, + "Standard_E64s_v4": { + InstanceType: "Standard_E64s_v4", + VCPU: 64, + MemoryMb: 516096, + GPU: 0, + }, + "Standard_E64s_v5": { + InstanceType: "Standard_E64s_v5", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + }, + "Standard_E8-2ads_v5": { + InstanceType: "Standard_E8-2ads_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2as_v4": { + InstanceType: "Standard_E8-2as_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2as_v5": { + InstanceType: "Standard_E8-2as_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2ds_v4": { + InstanceType: "Standard_E8-2ds_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2ds_v5": { + InstanceType: "Standard_E8-2ds_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2s_v3": { + InstanceType: "Standard_E8-2s_v3", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2s_v4": { + InstanceType: "Standard_E8-2s_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-2s_v5": { + InstanceType: "Standard_E8-2s_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4ads_v5": { + InstanceType: "Standard_E8-4ads_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4as_v4": { + InstanceType: "Standard_E8-4as_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4as_v5": { + InstanceType: "Standard_E8-4as_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4ds_v4": { + InstanceType: "Standard_E8-4ds_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4ds_v5": { + InstanceType: "Standard_E8-4ds_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4s_v3": { + InstanceType: "Standard_E8-4s_v3", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4s_v4": { + InstanceType: "Standard_E8-4s_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8-4s_v5": { + InstanceType: "Standard_E8-4s_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E80ids_v4": { + InstanceType: "Standard_E80ids_v4", + VCPU: 80, + MemoryMb: 516096, + GPU: 0, + }, + "Standard_E80is_v4": { + InstanceType: "Standard_E80is_v4", + VCPU: 80, + MemoryMb: 516096, + GPU: 0, + }, + "Standard_E8_v3": { + InstanceType: "Standard_E8_v3", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8_v4": { + InstanceType: "Standard_E8_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8_v5": { + InstanceType: "Standard_E8_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8a_v4": { + InstanceType: "Standard_E8a_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8ads_v5": { + InstanceType: "Standard_E8ads_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8as_v4": { + InstanceType: "Standard_E8as_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8as_v5": { + InstanceType: "Standard_E8as_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8d_v4": { + InstanceType: "Standard_E8d_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8d_v5": { + InstanceType: "Standard_E8d_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8ds_v4": { + InstanceType: "Standard_E8ds_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8ds_v5": { + InstanceType: "Standard_E8ds_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8s_v3": { + InstanceType: "Standard_E8s_v3", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8s_v4": { + InstanceType: "Standard_E8s_v4", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E8s_v5": { + InstanceType: "Standard_E8s_v5", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + }, + "Standard_E96-24ads_v5": { + InstanceType: "Standard_E96-24ads_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-24as_v4": { + InstanceType: "Standard_E96-24as_v4", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-24as_v5": { + InstanceType: "Standard_E96-24as_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-24ds_v5": { + InstanceType: "Standard_E96-24ds_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-24s_v5": { + InstanceType: "Standard_E96-24s_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-48ads_v5": { + InstanceType: "Standard_E96-48ads_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-48as_v4": { + InstanceType: "Standard_E96-48as_v4", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-48as_v5": { + InstanceType: "Standard_E96-48as_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-48ds_v5": { + InstanceType: "Standard_E96-48ds_v5", + VCPU: 96, + MemoryMb: 688128, + GPU: 0, + }, + "Standard_E96-48s_v5": { + InstanceType: "Standard_E96-48s_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E64d_v4": { - InstanceType: "Standard_E64d_v4", - VCPU: 64, - MemoryMb: 516096, + "Standard_E96_v5": { + InstanceType: "Standard_E96_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E64ds_v4": { - InstanceType: "Standard_E64ds_v4", - VCPU: 64, - MemoryMb: 516096, + "Standard_E96a_v4": { + InstanceType: "Standard_E96a_v4", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E64i_v3": { - InstanceType: "Standard_E64i_v3", - VCPU: 64, - MemoryMb: 442368, + "Standard_E96ads_v5": { + InstanceType: "Standard_E96ads_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E64is_v3": { - InstanceType: "Standard_E64is_v3", - VCPU: 64, - MemoryMb: 442368, + "Standard_E96as_v4": { + InstanceType: "Standard_E96as_v4", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E64s_v3": { - InstanceType: "Standard_E64s_v3", - VCPU: 64, - MemoryMb: 442368, + "Standard_E96as_v5": { + InstanceType: "Standard_E96as_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E64s_v4": { - InstanceType: "Standard_E64s_v4", - VCPU: 64, - MemoryMb: 516096, + "Standard_E96d_v5": { + InstanceType: "Standard_E96d_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E8-2as_v4": { - InstanceType: "Standard_E8-2as_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_E96ds_v5": { + InstanceType: "Standard_E96ds_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E8-2ds_v4": { - InstanceType: "Standard_E8-2ds_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_E96s_v5": { + InstanceType: "Standard_E96s_v5", + VCPU: 96, + MemoryMb: 688128, GPU: 0, }, - "Standard_E8-2s_v3": { - InstanceType: "Standard_E8-2s_v3", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC16ads_v5": { + InstanceType: "Standard_EC16ads_v5", + VCPU: 16, + MemoryMb: 131072, GPU: 0, }, - "Standard_E8-2s_v4": { - InstanceType: "Standard_E8-2s_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC16as_v5": { + InstanceType: "Standard_EC16as_v5", + VCPU: 16, + MemoryMb: 131072, GPU: 0, }, - "Standard_E8-4as_v4": { - InstanceType: "Standard_E8-4as_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC20ads_v5": { + InstanceType: "Standard_EC20ads_v5", + VCPU: 20, + MemoryMb: 163840, GPU: 0, }, - "Standard_E8-4ds_v4": { - InstanceType: "Standard_E8-4ds_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC20as_v5": { + InstanceType: "Standard_EC20as_v5", + VCPU: 20, + MemoryMb: 163840, GPU: 0, }, - "Standard_E8-4s_v3": { - InstanceType: "Standard_E8-4s_v3", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC2ads_v5": { + InstanceType: "Standard_EC2ads_v5", + VCPU: 2, + MemoryMb: 16384, GPU: 0, }, - "Standard_E8-4s_v4": { - InstanceType: "Standard_E8-4s_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC2as_v5": { + InstanceType: "Standard_EC2as_v5", + VCPU: 2, + MemoryMb: 16384, GPU: 0, }, - "Standard_E80ids_v4": { - InstanceType: "Standard_E80ids_v4", - VCPU: 80, - MemoryMb: 516096, + "Standard_EC32ads_v5": { + InstanceType: "Standard_EC32ads_v5", + VCPU: 32, + MemoryMb: 196608, GPU: 0, }, - "Standard_E80is_v4": { - InstanceType: "Standard_E80is_v4", - VCPU: 80, - MemoryMb: 516096, + "Standard_EC32as_v5": { + InstanceType: "Standard_EC32as_v5", + VCPU: 32, + MemoryMb: 196608, GPU: 0, }, - "Standard_E8_v3": { - InstanceType: "Standard_E8_v3", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC48ads_v5": { + InstanceType: "Standard_EC48ads_v5", + VCPU: 48, + MemoryMb: 393216, GPU: 0, }, - "Standard_E8_v4": { - InstanceType: "Standard_E8_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC48as_v5": { + InstanceType: "Standard_EC48as_v5", + VCPU: 48, + MemoryMb: 393216, GPU: 0, }, - "Standard_E8a_v4": { - InstanceType: "Standard_E8a_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC4ads_v5": { + InstanceType: "Standard_EC4ads_v5", + VCPU: 4, + MemoryMb: 32768, GPU: 0, }, - "Standard_E8as_v4": { - InstanceType: "Standard_E8as_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC4as_v5": { + InstanceType: "Standard_EC4as_v5", + VCPU: 4, + MemoryMb: 32768, GPU: 0, }, - "Standard_E8d_v4": { - InstanceType: "Standard_E8d_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC64ads_v5": { + InstanceType: "Standard_EC64ads_v5", + VCPU: 64, + MemoryMb: 524288, GPU: 0, }, - "Standard_E8ds_v4": { - InstanceType: "Standard_E8ds_v4", - VCPU: 8, - MemoryMb: 65536, + "Standard_EC64as_v5": { + InstanceType: "Standard_EC64as_v5", + VCPU: 64, + MemoryMb: 524288, GPU: 0, }, - "Standard_E8s_v3": { - InstanceType: "Standard_E8s_v3", + "Standard_EC8ads_v5": { + InstanceType: "Standard_EC8ads_v5", VCPU: 8, MemoryMb: 65536, GPU: 0, }, - "Standard_E8s_v4": { - InstanceType: "Standard_E8s_v4", + "Standard_EC8as_v5": { + InstanceType: "Standard_EC8as_v5", VCPU: 8, MemoryMb: 65536, GPU: 0, }, - "Standard_E96-24as_v4": { - InstanceType: "Standard_E96-24as_v4", + "Standard_EC96ads_v5": { + InstanceType: "Standard_EC96ads_v5", VCPU: 96, MemoryMb: 688128, GPU: 0, }, - "Standard_E96-48as_v4": { - InstanceType: "Standard_E96-48as_v4", + "Standard_EC96as_v5": { + InstanceType: "Standard_EC96as_v5", VCPU: 96, MemoryMb: 688128, GPU: 0, }, - "Standard_E96a_v4": { - InstanceType: "Standard_E96a_v4", + "Standard_EC96iads_v5": { + InstanceType: "Standard_EC96iads_v5", VCPU: 96, MemoryMb: 688128, GPU: 0, }, - "Standard_E96as_v4": { - InstanceType: "Standard_E96as_v4", + "Standard_EC96ias_v5": { + InstanceType: "Standard_EC96ias_v5", VCPU: 96, MemoryMb: 688128, GPU: 0, @@ -1810,6 +3022,36 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "Standard_FX12mds": { + InstanceType: "Standard_FX12mds", + VCPU: 12, + MemoryMb: 258048, + GPU: 0, + }, + "Standard_FX24mds": { + InstanceType: "Standard_FX24mds", + VCPU: 24, + MemoryMb: 516096, + GPU: 0, + }, + "Standard_FX36mds": { + InstanceType: "Standard_FX36mds", + VCPU: 36, + MemoryMb: 774144, + GPU: 0, + }, + "Standard_FX48mds": { + InstanceType: "Standard_FX48mds", + VCPU: 48, + MemoryMb: 1032192, + GPU: 0, + }, + "Standard_FX4mds": { + InstanceType: "Standard_FX4mds", + VCPU: 4, + MemoryMb: 86016, + GPU: 0, + }, "Standard_G1": { InstanceType: "Standard_G1", VCPU: 2, @@ -1966,22 +3208,52 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 114688, GPU: 0, }, + "Standard_HB120-16rs_v3": { + InstanceType: "Standard_HB120-16rs_v3", + VCPU: 120, + MemoryMb: 458752, + GPU: 0, + }, + "Standard_HB120-32rs_v3": { + InstanceType: "Standard_HB120-32rs_v3", + VCPU: 120, + MemoryMb: 458752, + GPU: 0, + }, + "Standard_HB120-64rs_v3": { + InstanceType: "Standard_HB120-64rs_v3", + VCPU: 120, + MemoryMb: 458752, + GPU: 0, + }, + "Standard_HB120-96rs_v3": { + InstanceType: "Standard_HB120-96rs_v3", + VCPU: 120, + MemoryMb: 458752, + GPU: 0, + }, "Standard_HB120rs_v2": { InstanceType: "Standard_HB120rs_v2", VCPU: 120, - MemoryMb: 479232, + MemoryMb: 466944, + GPU: 0, + }, + "Standard_HB120rs_v3": { + InstanceType: "Standard_HB120rs_v3", + VCPU: 120, + MemoryMb: 458752, GPU: 0, }, "Standard_HB60rs": { InstanceType: "Standard_HB60rs", VCPU: 60, - MemoryMb: 228352, + MemoryMb: 233472, GPU: 0, }, "Standard_HC44rs": { InstanceType: "Standard_HC44rs", VCPU: 44, - MemoryMb: 334848, + MemoryMb: 360448, GPU: 0, }, "Standard_L16s": { @@ -2062,6 +3334,18 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 3891200, GPU: 0, }, + "Standard_M128dms_v2": { + InstanceType: "Standard_M128dms_v2", + VCPU: 128, + MemoryMb: 3985408, + GPU: 0, + }, + "Standard_M128ds_v2": { + InstanceType: "Standard_M128ds_v2", + VCPU: 128, + MemoryMb: 2097152, + GPU: 0, + }, "Standard_M128m": { InstanceType: "Standard_M128m", VCPU: 128, @@ -2074,12 +3358,24 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 3891200, GPU: 0, }, + "Standard_M128ms_v2": { + InstanceType: "Standard_M128ms_v2", + VCPU: 128, + MemoryMb: 3985408, + GPU: 0, + }, "Standard_M128s": { InstanceType: "Standard_M128s", VCPU: 128, MemoryMb: 2048000, GPU: 0, }, + "Standard_M128s_v2": { + InstanceType: "Standard_M128s_v2", + VCPU: 128, + MemoryMb: 2097152, + GPU: 0, + }, "Standard_M16-4ms": { InstanceType: "Standard_M16-4ms", VCPU: 16, @@ -2098,6 +3394,30 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 447488, GPU: 0, }, + "Standard_M192idms_v2": { + InstanceType: "Standard_M192idms_v2", + VCPU: 192, + MemoryMb: 4194304, + GPU: 0, + }, + "Standard_M192ids_v2": { + InstanceType: "Standard_M192ids_v2", + VCPU: 192, + MemoryMb: 2097152, + GPU: 0, + }, + "Standard_M192ims_v2": { + InstanceType: "Standard_M192ims_v2", + VCPU: 192, + MemoryMb: 4194304, + GPU: 0, + }, + "Standard_M192is_v2": { + InstanceType: "Standard_M192is_v2", + VCPU: 192, + MemoryMb: 2097152, + GPU: 0, + }, "Standard_M208ms_v2": { InstanceType: "Standard_M208ms_v2", VCPU: 208, @@ -2122,6 +3442,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 896000, GPU: 0, }, + "Standard_M32dms_v2": { + InstanceType: "Standard_M32dms_v2", + VCPU: 32, + MemoryMb: 896000, + GPU: 0, + }, "Standard_M32ls": { InstanceType: "Standard_M32ls", VCPU: 32, @@ -2134,6 +3460,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 896000, GPU: 0, }, + "Standard_M32ms_v2": { + InstanceType: "Standard_M32ms_v2", + VCPU: 32, + MemoryMb: 896000, + GPU: 0, + }, "Standard_M32ts": { InstanceType: "Standard_M32ts", VCPU: 32, @@ -2182,6 +3514,18 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 1792000, GPU: 0, }, + "Standard_M64dms_v2": { + InstanceType: "Standard_M64dms_v2", + VCPU: 64, + MemoryMb: 1835008, + GPU: 0, + }, + "Standard_M64ds_v2": { + InstanceType: "Standard_M64ds_v2", + VCPU: 64, + MemoryMb: 1048576, + GPU: 0, + }, "Standard_M64ls": { InstanceType: "Standard_M64ls", VCPU: 64, @@ -2200,12 +3544,24 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 1792000, GPU: 0, }, + "Standard_M64ms_v2": { + InstanceType: "Standard_M64ms_v2", + VCPU: 64, + MemoryMb: 1835008, + GPU: 0, + }, "Standard_M64s": { InstanceType: "Standard_M64s", VCPU: 64, MemoryMb: 1024000, GPU: 0, }, + "Standard_M64s_v2": { + InstanceType: "Standard_M64s_v2", + VCPU: 64, + MemoryMb: 1048576, + GPU: 0, + }, "Standard_M8-2ms": { InstanceType: "Standard_M8-2ms", VCPU: 8, @@ -2251,7 +3607,7 @@ var InstanceTypes = map[string]*InstanceType{ "Standard_NC16as_T4_v3": { InstanceType: "Standard_NC16as_T4_v3", VCPU: 16, - MemoryMb: 114688, + MemoryMb: 112640, GPU: 1, }, "Standard_NC24": { @@ -2317,7 +3673,7 @@ var InstanceTypes = map[string]*InstanceType{ "Standard_NC64as_T4_v3": { InstanceType: "Standard_NC64as_T4_v3", VCPU: 64, - MemoryMb: 458752, + MemoryMb: 450560, GPU: 4, }, "Standard_NC6_Promo": { @@ -2338,6 +3694,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 114688, GPU: 1, }, + "Standard_NC8as_T4_v3": { + InstanceType: "Standard_NC8as_T4_v3", + VCPU: 8, + MemoryMb: 57344, + GPU: 1, + }, "Standard_ND12s": { InstanceType: "Standard_ND12s", VCPU: 12, @@ -2356,22 +3718,22 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 458752, GPU: 4, }, + "Standard_ND40rs_v2": { + InstanceType: "Standard_ND40rs_v2", + VCPU: 40, + MemoryMb: 688128, + GPU: 8, + }, "Standard_ND6s": { InstanceType: "Standard_ND6s", VCPU: 6, MemoryMb: 114688, GPU: 1, }, - "Standard_NC8as_T4_v3": { - InstanceType: "Standard_NC8as_T4_v3", - VCPU: 8, - MemoryMb: 57344, - GPU: 1, - }, - "Standard_ND40rs_v2": { - InstanceType: "Standard_ND40rs_v2", - VCPU: 40, - MemoryMb: 688128, + "Standard_ND96amsr_A100_v4": { + InstanceType: "Standard_ND96amsr_A100_v4", + VCPU: 96, + MemoryMb: 1970176, GPU: 8, }, "Standard_NV12": { diff --git a/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go b/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go index ca2495f8c4a9..55308a505136 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go @@ -32,7 +32,7 @@ import ( ) var packageTemplate = template.Must(template.New("").Parse(`/* -Copyright 2018 The Kubernetes Authors. +Copyright The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.