Azure
/
ARO-RP
зеркало из https://github.com/Azure/ARO-RP.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

api: add vm types to current api

This commit is contained in:
Troy Connor 2021-06-09 11:07:27 -04:00
Родитель 2aba619c85
Коммит bf72da5d3a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 97E3BD011FA14CF8
10 изменённых файлов: 78 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.sha256sum
Просмотреть файл

@ -1,2 +1,2 @@
d2e11a7924d0cbb70672fb0dd6b1a387ccaec8b97a6968adf5a1516d325374eb swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
e1b7b501336b2d22cde52bcc36a697c4416d255adcf33b1aaf72922f3984afe7 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-01-31-preview/redhatopenshift.json
2f8edbcdc4b273f0102d3b0d0a02971a82e08457c0e37e50c1ac570542e1861d swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-01-31-preview/redhatopenshift.json

15
pkg/api/admin/openshiftcluster.go
Просмотреть файл

@ -112,15 +112,22 @@ const (
VMSizeStandardD16sV3 VMSize = "Standard_D16s_v3"
VMSizeStandardD32sV3 VMSize = "Standard_D32s_v3"
VMSizeStandardE4sV3 VMSize = "Standard_E4s_v3"
VMSizeStandardE8sV3 VMSize = "Standard_E8s_v3"
VMSizeStandardE16sV3 VMSize = "Standard_E16s_v3"
VMSizeStandardE32sV3 VMSize = "Standard_E32s_v3"
VMSizeStandardE4sV3 VMSize = "Standard_E4s_v3"
VMSizeStandardE8sV3 VMSize = "Standard_E8s_v3"
VMSizeStandardE16sV3 VMSize = "Standard_E16s_v3"
VMSizeStandardE32sV3 VMSize = "Standard_E32s_v3"
VMSizeStandardE64isV3 VMSize = "Standard_E64is_v3"
VMSizeStandardE64iV3 VMSize = "Standard_E64i_v3"
VMSizeStandardF4sV2 VMSize = "Standard_F4s_v2"
VMSizeStandardF8sV2 VMSize = "Standard_F8s_v2"
VMSizeStandardF16sV2 VMSize = "Standard_F16s_v2"
VMSizeStandardF32sV2 VMSize = "Standard_F32s_v2"
VMSizeStandardF72sV2 VMSize = "Standard_F72s_v2"
VMSizeStandardM128ms VMSize = "Standard_M128ms"
VMSizeStandardG5 VMSize = "Standard_G5"
VMSizeStandardGS5 VMSize = "Standard_GS5"
)
// WorkerProfile represents a worker profile.

15
pkg/api/openshiftcluster.go
Просмотреть файл

@ -228,15 +228,22 @@ const (
VMSizeStandardD16sV3 VMSize = "Standard_D16s_v3"
VMSizeStandardD32sV3 VMSize = "Standard_D32s_v3"
VMSizeStandardE4sV3 VMSize = "Standard_E4s_v3"
VMSizeStandardE8sV3 VMSize = "Standard_E8s_v3"
VMSizeStandardE16sV3 VMSize = "Standard_E16s_v3"
VMSizeStandardE32sV3 VMSize = "Standard_E32s_v3"
VMSizeStandardE4sV3 VMSize = "Standard_E4s_v3"
VMSizeStandardE8sV3 VMSize = "Standard_E8s_v3"
VMSizeStandardE16sV3 VMSize = "Standard_E16s_v3"
VMSizeStandardE32sV3 VMSize = "Standard_E32s_v3"
VMSizeStandardE64isV3 VMSize = "Standard_E64is_v3"
VMSizeStandardE64iV3 VMSize = "Standard_E64i_v3"
VMSizeStandardF4sV2 VMSize = "Standard_F4s_v2"
VMSizeStandardF8sV2 VMSize = "Standard_F8s_v2"
VMSizeStandardF16sV2 VMSize = "Standard_F16s_v2"
VMSizeStandardF32sV2 VMSize = "Standard_F32s_v2"
VMSizeStandardF72sV2 VMSize = "Standard_F72s_v2"
VMSizeStandardM128ms VMSize = "Standard_M128ms"
VMSizeStandardG5 VMSize = "Standard_G5"
VMSizeStandardGS5 VMSize = "Standard_GS5"
)
// WorkerProfile represents a worker profile

15
pkg/api/v20210131preview/openshiftcluster.go
Просмотреть файл

@ -149,15 +149,22 @@ const (
VMSizeStandardD16sV3 VMSize = "Standard_D16s_v3"
VMSizeStandardD32sV3 VMSize = "Standard_D32s_v3"
VMSizeStandardE4sV3 VMSize = "Standard_E4s_v3"
VMSizeStandardE8sV3 VMSize = "Standard_E8s_v3"
VMSizeStandardE16sV3 VMSize = "Standard_E16s_v3"
VMSizeStandardE32sV3 VMSize = "Standard_E32s_v3"
VMSizeStandardE4sV3 VMSize = "Standard_E4s_v3"
VMSizeStandardE8sV3 VMSize = "Standard_E8s_v3"
VMSizeStandardE16sV3 VMSize = "Standard_E16s_v3"
VMSizeStandardE32sV3 VMSize = "Standard_E32s_v3"
VMSizeStandardE64isV3 VMSize = "Standard_E64is_v3"
VMSizeStandardE64iV3 VMSize = "Standard_E64i_v3"
VMSizeStandardF4sV2 VMSize = "Standard_F4s_v2"
VMSizeStandardF8sV2 VMSize = "Standard_F8s_v2"
VMSizeStandardF16sV2 VMSize = "Standard_F16s_v2"
VMSizeStandardF32sV2 VMSize = "Standard_F32s_v2"
VMSizeStandardF72sV2 VMSize = "Standard_F72s_v2"
VMSizeStandardM128ms VMSize = "Standard_M128ms"
VMSizeStandardG5 VMSize = "Standard_G5"
VMSizeStandardGS5 VMSize = "Standard_GS5"
)
// WorkerProfile represents a worker profile.

14
pkg/client/services/redhatopenshift/mgmt/2021-01-31-preview/redhatopenshift/enums.go
Просмотреть файл

@ -117,6 +117,10 @@ const (
StandardE32sV3 VMSize = "Standard_E32s_v3"
// StandardE4sV3 ...
StandardE4sV3 VMSize = "Standard_E4s_v3"
// StandardE64isV3 ...
StandardE64isV3 VMSize = "Standard_E64is_v3"
// StandardE64iV3 ...
StandardE64iV3 VMSize = "Standard_E64i_v3"
// StandardE8sV3 ...
StandardE8sV3 VMSize = "Standard_E8s_v3"
// StandardF16sV2 ...
@ -125,11 +129,19 @@ const (
StandardF32sV2 VMSize = "Standard_F32s_v2"
// StandardF4sV2 ...
StandardF4sV2 VMSize = "Standard_F4s_v2"
// StandardF72sV2 ...
StandardF72sV2 VMSize = "Standard_F72s_v2"
// StandardF8sV2 ...
StandardF8sV2 VMSize = "Standard_F8s_v2"
// StandardG5 ...
StandardG5 VMSize = "Standard_G5"
// StandardGS5 ...
StandardGS5 VMSize = "Standard_GS5"
// StandardM128ms ...
StandardM128ms VMSize = "Standard_M128ms"
)
// PossibleVMSizeValues returns an array of possible values for the VMSize const type.
func PossibleVMSizeValues() []VMSize {
return []VMSize{StandardD16asV4, StandardD16sV3, StandardD2sV3, StandardD32asV4, StandardD32sV3, StandardD4asV4, StandardD4sV3, StandardD8asV4, StandardD8sV3, StandardE16sV3, StandardE32sV3, StandardE4sV3, StandardE8sV3, StandardF16sV2, StandardF32sV2, StandardF4sV2, StandardF8sV2}
return []VMSize{StandardD16asV4, StandardD16sV3, StandardD2sV3, StandardD32asV4, StandardD32sV3, StandardD4asV4, StandardD4sV3, StandardD8asV4, StandardD8sV3, StandardE16sV3, StandardE32sV3, StandardE4sV3, StandardE64isV3, StandardE64iV3, StandardE8sV3, StandardF16sV2, StandardF32sV2, StandardF4sV2, StandardF72sV2, StandardF8sV2, StandardG5, StandardGS5, StandardM128ms}
}

4
pkg/client/services/redhatopenshift/mgmt/2021-01-31-preview/redhatopenshift/models.go
Просмотреть файл

@ -120,7 +120,7 @@ type IngressProfile struct {
// MasterProfile masterProfile represents a master profile.
type MasterProfile struct {
// VMSize - The size of the master VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF8sV2'
// VMSize - The size of the master VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardM128ms'
VMSize VMSize `json:"vmSize,omitempty"`
// SubnetID - The Azure resource ID of the master subnet.
SubnetID *string `json:"subnetId,omitempty"`
@ -887,7 +887,7 @@ func (tr TrackedResource) MarshalJSON() ([]byte, error) {
type WorkerProfile struct {
// Name - The worker profile name.
Name *string `json:"name,omitempty"`
// VMSize - The size of the worker VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF8sV2'
// VMSize - The size of the worker VMs. Possible values include: 'StandardD16asV4', 'StandardD16sV3', 'StandardD2sV3', 'StandardD32asV4', 'StandardD32sV3', 'StandardD4asV4', 'StandardD4sV3', 'StandardD8asV4', 'StandardD8sV3', 'StandardE16sV3', 'StandardE32sV3', 'StandardE4sV3', 'StandardE64iV3', 'StandardE64isV3', 'StandardE8sV3', 'StandardF16sV2', 'StandardF32sV2', 'StandardF4sV2', 'StandardF72sV2', 'StandardF8sV2', 'StandardG5', 'StandardGS5', 'StandardM128ms'
VMSize VMSize `json:"vmSize,omitempty"`
// DiskSizeGB - The disk size of the worker VMs.
DiskSizeGB *int32 `json:"diskSizeGB,omitempty"`

6
python/client/azure/mgmt/redhatopenshift/v2021_01_31_preview/models/_azure_red_hat_open_shift_client_enums.py
Просмотреть файл

@ -36,11 +36,17 @@ class VMSize(str, Enum):
standard_e16s_v3 = "Standard_E16s_v3"
standard_e32s_v3 = "Standard_E32s_v3"
standard_e4s_v3 = "Standard_E4s_v3"
standard_e64i_v3 = "Standard_E64i_v3"
standard_e64is_v3 = "Standard_E64is_v3"
standard_e8s_v3 = "Standard_E8s_v3"
standard_f16s_v2 = "Standard_F16s_v2"
standard_f32s_v2 = "Standard_F32s_v2"
standard_f4s_v2 = "Standard_F4s_v2"
standard_f72s_v2 = "Standard_F72s_v2"
standard_f8s_v2 = "Standard_F8s_v2"
standard_g5 = "Standard_G5"
standard_gs5 = "Standard_GS5"
standard_m128ms = "Standard_M128ms"
class CreatedByType(str, Enum):

12
python/client/azure/mgmt/redhatopenshift/v2021_01_31_preview/models/_models.py
Просмотреть файл

@ -291,8 +291,10 @@ class MasterProfile(Model):
'Standard_D32as_v4', 'Standard_D32s_v3', 'Standard_D4as_v4',
'Standard_D4s_v3', 'Standard_D8as_v4', 'Standard_D8s_v3',
'Standard_E16s_v3', 'Standard_E32s_v3', 'Standard_E4s_v3',
'Standard_E8s_v3', 'Standard_F16s_v2', 'Standard_F32s_v2',
'Standard_F4s_v2', 'Standard_F8s_v2'
'Standard_E64i_v3', 'Standard_E64is_v3', 'Standard_E8s_v3',
'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F4s_v2',
'Standard_F72s_v2', 'Standard_F8s_v2', 'Standard_G5', 'Standard_GS5',
'Standard_M128ms'
:type vm_size: str or
~azure.mgmt.redhatopenshift.v2021_01_31_preview.models.VMSize
:param subnet_id: The Azure resource ID of the master subnet.
@ -711,8 +713,10 @@ class WorkerProfile(Model):
'Standard_D32as_v4', 'Standard_D32s_v3', 'Standard_D4as_v4',
'Standard_D4s_v3', 'Standard_D8as_v4', 'Standard_D8s_v3',
'Standard_E16s_v3', 'Standard_E32s_v3', 'Standard_E4s_v3',
'Standard_E8s_v3', 'Standard_F16s_v2', 'Standard_F32s_v2',
'Standard_F4s_v2', 'Standard_F8s_v2'
'Standard_E64i_v3', 'Standard_E64is_v3', 'Standard_E8s_v3',
'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F4s_v2',
'Standard_F72s_v2', 'Standard_F8s_v2', 'Standard_G5', 'Standard_GS5',
'Standard_M128ms'
:type vm_size: str or
~azure.mgmt.redhatopenshift.v2021_01_31_preview.models.VMSize
:param disk_size_gb: The disk size of the worker VMs.

12
python/client/azure/mgmt/redhatopenshift/v2021_01_31_preview/models/_models_py3.py
Просмотреть файл

@ -291,8 +291,10 @@ class MasterProfile(Model):
'Standard_D32as_v4', 'Standard_D32s_v3', 'Standard_D4as_v4',
'Standard_D4s_v3', 'Standard_D8as_v4', 'Standard_D8s_v3',
'Standard_E16s_v3', 'Standard_E32s_v3', 'Standard_E4s_v3',
'Standard_E8s_v3', 'Standard_F16s_v2', 'Standard_F32s_v2',
'Standard_F4s_v2', 'Standard_F8s_v2'
'Standard_E64i_v3', 'Standard_E64is_v3', 'Standard_E8s_v3',
'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F4s_v2',
'Standard_F72s_v2', 'Standard_F8s_v2', 'Standard_G5', 'Standard_GS5',
'Standard_M128ms'
:type vm_size: str or
~azure.mgmt.redhatopenshift.v2021_01_31_preview.models.VMSize
:param subnet_id: The Azure resource ID of the master subnet.
@ -711,8 +713,10 @@ class WorkerProfile(Model):
'Standard_D32as_v4', 'Standard_D32s_v3', 'Standard_D4as_v4',
'Standard_D4s_v3', 'Standard_D8as_v4', 'Standard_D8s_v3',
'Standard_E16s_v3', 'Standard_E32s_v3', 'Standard_E4s_v3',
'Standard_E8s_v3', 'Standard_F16s_v2', 'Standard_F32s_v2',
'Standard_F4s_v2', 'Standard_F8s_v2'
'Standard_E64i_v3', 'Standard_E64is_v3', 'Standard_E8s_v3',
'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F4s_v2',
'Standard_F72s_v2', 'Standard_F8s_v2', 'Standard_G5', 'Standard_GS5',
'Standard_M128ms'
:type vm_size: str or
~azure.mgmt.redhatopenshift.v2021_01_31_preview.models.VMSize
:param disk_size_gb: The disk size of the worker VMs.

8
swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/preview/2021-01-31-preview/redhatopenshift.json
Просмотреть файл

@ -795,11 +795,17 @@
"Standard_E16s_v3",
"Standard_E32s_v3",
"Standard_E4s_v3",
"Standard_E64i_v3",
"Standard_E64is_v3",
"Standard_E8s_v3",
"Standard_F16s_v2",
"Standard_F32s_v2",
"Standard_F4s_v2",
"Standard_F8s_v2"
"Standard_F72s_v2",
"Standard_F8s_v2",
"Standard_G5",
"Standard_GS5",
"Standard_M128ms"
],
"type": "string",
"x-ms-enum": {