diff --git a/pkg/api/admin/openshiftcluster.go b/pkg/api/admin/openshiftcluster.go index ab5b60a8351..0d2f69cd881 100644 --- a/pkg/api/admin/openshiftcluster.go +++ b/pkg/api/admin/openshiftcluster.go @@ -170,6 +170,16 @@ const ( VMSizeStandardM128ms VMSize = "Standard_M128ms" VMSizeStandardG5 VMSize = "Standard_G5" VMSizeStandardGS5 VMSize = "Standard_GS5" + + VMSizeStandardL4s VMSize = "Standard_L4s" + VMSizeStandardL8s VMSize = "Standard_L8s" + VMSizeStandardL16s VMSize = "Standard_L16s" + VMSizeStandardL32s VMSize = "Standard_L32s" + VMSizeStandardL8sV2 VMSize = "Standard_L8s_v2" + VMSizeStandardL16sV2 VMSize = "Standard_L16s_v2" + VMSizeStandardL32sV2 VMSize = "Standard_L32s_v2" + VMSizeStandardL48sV2 VMSize = "Standard_L48s_v2" + VMSizeStandardL64sV2 VMSize = "Standard_L64s_v2" ) // WorkerProfile represents a worker profile. diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go index c2a1f7802d0..878974d5a0e 100644 --- a/pkg/api/openshiftcluster.go +++ b/pkg/api/openshiftcluster.go @@ -286,6 +286,16 @@ const ( VMSizeStandardM128ms VMSize = "Standard_M128ms" VMSizeStandardG5 VMSize = "Standard_G5" VMSizeStandardGS5 VMSize = "Standard_GS5" + + VMSizeStandardL4s VMSize = "Standard_L4s" + VMSizeStandardL8s VMSize = "Standard_L8s" + VMSizeStandardL16s VMSize = "Standard_L16s" + VMSizeStandardL32s VMSize = "Standard_L32s" + VMSizeStandardL8sV2 VMSize = "Standard_L8s_v2" + VMSizeStandardL16sV2 VMSize = "Standard_L16s_v2" + VMSizeStandardL32sV2 VMSize = "Standard_L32s_v2" + VMSizeStandardL48sV2 VMSize = "Standard_L48s_v2" + VMSizeStandardL64sV2 VMSize = "Standard_L64s_v2" ) // WorkerProfile represents a worker profile diff --git a/pkg/api/validate/dynamic/quota.go b/pkg/api/validate/dynamic/quota.go index 4c1181b427e..c6305ab05d3 100644 --- a/pkg/api/validate/dynamic/quota.go +++ b/pkg/api/validate/dynamic/quota.go @@ -88,6 +88,33 @@ func addRequiredResources(requiredResources map[string]int, vmSize api.VMSize, c case api.VMSizeStandardGS5: requiredResources["standardGSFamily"] += (count * 32) requiredResources["cores"] += (count * 32) + case api.VMSizeStandardL4s: + requiredResources["standardLsFamily"] += (count * 4) + requiredResources["cores"] += (count * 4) + case api.VMSizeStandardL8s: + requiredResources["standardLsFamily"] += (count * 8) + requiredResources["cores"] += (count * 8) + case api.VMSizeStandardL16s: + requiredResources["standardLsFamily"] += (count * 16) + requiredResources["cores"] += (count * 16) + case api.VMSizeStandardL32s: + requiredResources["standardLsFamily"] += (count * 32) + requiredResources["cores"] += (count * 32) + case api.VMSizeStandardL8sV2: + requiredResources["standardLsv2Family"] += (count * 8) + requiredResources["cores"] += (count * 8) + case api.VMSizeStandardL16sV2: + requiredResources["standardLsv2Family"] += (count * 16) + requiredResources["cores"] += (count * 16) + case api.VMSizeStandardL32sV2: + requiredResources["standardLsv2Family"] += (count * 32) + requiredResources["cores"] += (count * 32) + case api.VMSizeStandardL48sV2: + requiredResources["standardLsv2Family"] += (count * 48) + requiredResources["cores"] += (count * 48) + case api.VMSizeStandardL64sV2: + requiredResources["standardLsv2Family"] += (count * 64) + requiredResources["cores"] += (count * 64) default: //will only happen if pkg/api verification allows new VMSizes return fmt.Errorf("unexpected node VMSize %s", vmSize) diff --git a/pkg/api/validate/vm.go b/pkg/api/validate/vm.go index e8d8c53b56d..79f8b19b552 100644 --- a/pkg/api/validate/vm.go +++ b/pkg/api/validate/vm.go @@ -54,7 +54,16 @@ func VMSizeIsValid(vmSize api.VMSize, requiredD2sV3Workers, isMaster bool) bool api.VMSizeStandardF72sV2, api.VMSizeStandardG5, api.VMSizeStandardGS5, - api.VMSizeStandardM128ms: + api.VMSizeStandardM128ms, + api.VMSizeStandardL4s, + api.VMSizeStandardL8s, + api.VMSizeStandardL16s, + api.VMSizeStandardL32s, + api.VMSizeStandardL8sV2, + api.VMSizeStandardL16sV2, + api.VMSizeStandardL32sV2, + api.VMSizeStandardL48sV2, + api.VMSizeStandardL64sV2: return true } }