Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

L series support - RP changes #1751

Merged
merged 2 commits into from
Mar 2, 2022
Merged

L series support - RP changes #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
172a305
add L-series SKUs to internal, admin, validate api
cadenmarchese Sep 16, 2021
ddb201c
make client
cadenmarchese Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/api/admin/openshiftcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions pkg/api/openshiftcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 27 additions & 0 deletions pkg/api/validate/dynamic/quota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 10 additions & 1 deletion pkg/api/validate/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down