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

Increase workers from 20 to 50

This commit is contained in:
Mangirdas Judeikis 2020-11-18 17:55:56 +00:00
Родитель 1fc6b2df56
Коммит e03d708fdb
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: AA071F630E926BBD
18 изменённых файлов: 37 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1 +1 @@
e9df99814e35e892b40a58d60b4f17dd2569f8d3eb7a68c9658bf640764fc64a swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-10-31-preview/redhatopenshift.json
46786bef73e96b18e973e537bf41f319ef4e55c5aaaa4cee1f51f4859ea511d9 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-10-31-preview/redhatopenshift.json

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

@ -169,7 +169,7 @@ type WorkerProfile struct {
// The Azure resource ID of the worker subnet (immutable).
SubnetID string `json:"subnetId,omitempty"`
// The number of worker VMs. Must be between 3 and 20 (immutable).
// The number of worker VMs.
Count int `json:"count,omitempty"`
}

2
pkg/api/v20191231preview/openshiftcluster_validatestatic.go
Просмотреть файл

@ -248,7 +248,7 @@ func (sv *openShiftClusterStaticValidator) validateWorkerProfile(path string, wp
if strings.EqualFold(mp.SubnetID, wp.SubnetID) {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".subnetId", "The provided worker VM subnet '%s' is invalid: must be different to master VM subnet '%s'.", wp.SubnetID, mp.SubnetID)
}
if wp.Count < 3 || wp.Count > 20 {
if wp.Count < 2 || wp.Count > 50 {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".count", "The provided worker count '%d' is invalid.", wp.Count)
}

8
pkg/api/v20191231preview/openshiftcluster_validatestatic_test.go
Просмотреть файл

@ -520,16 +520,16 @@ func TestOpenShiftClusterStaticValidateWorkerProfile(t *testing.T) {
{
name: "count too small",
modify: func(oc *OpenShiftCluster) {
oc.Properties.WorkerProfiles[0].Count = 2
oc.Properties.WorkerProfiles[0].Count = 1
},
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '2' is invalid.",
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '1' is invalid.",
},
{
name: "count too big",
modify: func(oc *OpenShiftCluster) {
oc.Properties.WorkerProfiles[0].Count = 21
oc.Properties.WorkerProfiles[0].Count = 51
},
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '21' is invalid.",
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '51' is invalid.",
},
}

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

@ -169,7 +169,7 @@ type WorkerProfile struct {
// The Azure resource ID of the worker subnet (immutable).
SubnetID string `json:"subnetId,omitempty"`
// The number of worker VMs. Must be between 3 and 20 (immutable).
// The number of worker VMs.
Count int `json:"count,omitempty"`
}

2
pkg/api/v20200430/openshiftcluster_validatestatic.go
Просмотреть файл

@ -248,7 +248,7 @@ func (sv *openShiftClusterStaticValidator) validateWorkerProfile(path string, wp
if strings.EqualFold(mp.SubnetID, wp.SubnetID) {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".subnetId", "The provided worker VM subnet '%s' is invalid: must be different to master VM subnet '%s'.", wp.SubnetID, mp.SubnetID)
}
if wp.Count < 3 || wp.Count > 20 {
if wp.Count < 2 || wp.Count > 50 {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".count", "The provided worker count '%d' is invalid.", wp.Count)
}

8
pkg/api/v20200430/openshiftcluster_validatestatic_test.go
Просмотреть файл

@ -520,16 +520,16 @@ func TestOpenShiftClusterStaticValidateWorkerProfile(t *testing.T) {
{
name: "count too small",
modify: func(oc *OpenShiftCluster) {
oc.Properties.WorkerProfiles[0].Count = 2
oc.Properties.WorkerProfiles[0].Count = 1
},
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '2' is invalid.",
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '1' is invalid.",
},
{
name: "count too big",
modify: func(oc *OpenShiftCluster) {
oc.Properties.WorkerProfiles[0].Count = 21
oc.Properties.WorkerProfiles[0].Count = 51
},
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '21' is invalid.",
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '51' is invalid.",
},
}

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

@ -169,7 +169,7 @@ type WorkerProfile struct {
// The Azure resource ID of the worker subnet (immutable).
SubnetID string `json:"subnetId,omitempty"`
// The number of worker VMs. Must be between 3 and 20 (immutable).
// The number of worker VMs.
Count int `json:"count,omitempty"`
}

2
pkg/api/v20201031preview/openshiftcluster_validatestatic.go
Просмотреть файл

@ -248,7 +248,7 @@ func (sv *openShiftClusterStaticValidator) validateWorkerProfile(path string, wp
if strings.EqualFold(mp.SubnetID, wp.SubnetID) {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".subnetId", "The provided worker VM subnet '%s' is invalid: must be different to master VM subnet '%s'.", wp.SubnetID, mp.SubnetID)
}
if wp.Count < 3 || wp.Count > 20 {
if wp.Count < 2 || wp.Count > 50 {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".count", "The provided worker count '%d' is invalid.", wp.Count)
}

8
pkg/api/v20201031preview/openshiftcluster_validatestatic_test.go
Просмотреть файл

@ -520,16 +520,16 @@ func TestOpenShiftClusterStaticValidateWorkerProfile(t *testing.T) {
{
name: "count too small",
modify: func(oc *OpenShiftCluster) {
oc.Properties.WorkerProfiles[0].Count = 2
oc.Properties.WorkerProfiles[0].Count = 1
},
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '2' is invalid.",
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '1' is invalid.",
},
{
name: "count too big",
modify: func(oc *OpenShiftCluster) {
oc.Properties.WorkerProfiles[0].Count = 21
oc.Properties.WorkerProfiles[0].Count = 51
},
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '21' is invalid.",
wantErr: "400: InvalidParameter: properties.workerProfiles['worker'].count: The provided worker count '51' is invalid.",
},
}

16
pkg/client/services/redhatopenshift/mgmt/2020-04-30/redhatopenshift/models.go
Просмотреть файл

@ -389,8 +389,11 @@ func (page OpenShiftClusterListPage) Values() []OpenShiftCluster {
}
// Creates a new instance of the OpenShiftClusterListPage type.
func NewOpenShiftClusterListPage(getNextPage func(context.Context, OpenShiftClusterList) (OpenShiftClusterList, error)) OpenShiftClusterListPage {
return OpenShiftClusterListPage{fn: getNextPage}
func NewOpenShiftClusterListPage(cur OpenShiftClusterList, getNextPage func(context.Context, OpenShiftClusterList) (OpenShiftClusterList, error)) OpenShiftClusterListPage {
return OpenShiftClusterListPage{
fn: getNextPage,
oscl: cur,
}
}
// OpenShiftClusterProperties openShiftClusterProperties represents an OpenShift cluster's properties.
@ -711,8 +714,11 @@ func (page OperationListPage) Values() []Operation {
}
// Creates a new instance of the OperationListPage type.
func NewOperationListPage(getNextPage func(context.Context, OperationList) (OperationList, error)) OperationListPage {
return OperationListPage{fn: getNextPage}
func NewOperationListPage(cur OperationList, getNextPage func(context.Context, OperationList) (OperationList, error)) OperationListPage {
return OperationListPage{
fn: getNextPage,
ol: cur,
}
}
// ProxyResource the resource model definition for a ARM proxy resource. It will have everything other than
@ -780,6 +786,6 @@ type WorkerProfile struct {
DiskSizeGB *int32 `json:"diskSizeGB,omitempty"`
// SubnetID - The Azure resource ID of the worker subnet (immutable).
SubnetID *string `json:"subnetId,omitempty"`
// Count - The number of worker VMs. Must be between 3 and 20 (immutable).
// Count - The number of worker VMs.
Count *int32 `json:"count,omitempty"`
}

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

@ -786,6 +786,6 @@ type WorkerProfile struct {
DiskSizeGB *int32 `json:"diskSizeGB,omitempty"`
// SubnetID - The Azure resource ID of the worker subnet (immutable).
SubnetID *string `json:"subnetId,omitempty"`
// Count - The number of worker VMs. Must be between 3 and 20 (immutable).
// Count - The number of worker VMs.
Count *int32 `json:"count,omitempty"`
}

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

@ -639,8 +639,7 @@ class WorkerProfile(Model):
:type disk_size_gb: int
:param subnet_id: The Azure resource ID of the worker subnet (immutable).
:type subnet_id: str
:param count: The number of worker VMs. Must be between 3 and 20
(immutable).
:param count: The number of worker VMs.
:type count: int
"""

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

@ -639,8 +639,7 @@ class WorkerProfile(Model):
:type disk_size_gb: int
:param subnet_id: The Azure resource ID of the worker subnet (immutable).
:type subnet_id: str
:param count: The number of worker VMs. Must be between 3 and 20
(immutable).
:param count: The number of worker VMs.
:type count: int
"""

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

@ -643,8 +643,7 @@ class WorkerProfile(Model):
:type disk_size_gb: int
:param subnet_id: The Azure resource ID of the worker subnet (immutable).
:type subnet_id: str
:param count: The number of worker VMs. Must be between 3 and 20
(immutable).
:param count: The number of worker VMs.
:type count: int
"""

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

@ -643,8 +643,7 @@ class WorkerProfile(Model):
:type disk_size_gb: int
:param subnet_id: The Azure resource ID of the worker subnet (immutable).
:type subnet_id: str
:param count: The number of worker VMs. Must be between 3 and 20
(immutable).
:param count: The number of worker VMs.
:type count: int
"""

2
swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json
Просмотреть файл

@ -765,7 +765,7 @@
"type": "string"
},
"count": {
"description": "The number of worker VMs. Must be between 3 and 20 (immutable).",
"description": "The number of worker VMs.",
"type": "integer"
}
}

2
swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/stable/2020-10-31-preview/redhatopenshift.json
Просмотреть файл

@ -769,7 +769,7 @@
"type": "string"
},
"count": {
"description": "The number of worker VMs. Must be between 3 and 20 (immutable).",
"description": "The number of worker VMs.",
"type": "integer"
}
}