opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17163 from ioito/hotfix/qx-node-pool-instance-count

Browse Source 
fix(region): node pool instance min count
This commit is contained in:
Zexi Li
2023-05-26 15:23:24 +08:00
committed by GitHub
parent 8fdd2680be 9ca8553396
commit a6614bedcf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/kube_node_pools.go
+11 -2
View File
@@ -63,9 +63,9 @@ type SKubeNodePool struct {
NetworkIds *api.SKubeNetworkIds `list:"user" update:"user" create:"required"`
InstanceTypes *api.SInstanceTypes `list:"user" update:"user" create:"required"`
MinInstanceCount int `nullable:"false" list:"user" create:"optional" default:"2"`
MinInstanceCount int `nullable:"false" list:"user" create:"optional" default:"0"`
MaxInstanceCount int `nullable:"false" list:"user" create:"optional" default:"2"`
DesiredInstanceCount int `nullable:"false" list:"user" create:"optional" default:"2"`
DesiredInstanceCount int `nullable:"false" list:"user" create:"optional" default:"0"`
RootDiskSizeGb int `nullable:"false" list:"user" create:"optional" default:"100"`
@@ -333,6 +333,15 @@ func (manager *SKubeNodePoolManager) ValidateCreateData(ctx context.Context, use
}
}
if input.DesiredInstanceCount > 0 {
if input.MinInstanceCount > input.DesiredInstanceCount {
return nil, httperrors.NewOutOfRangeError("min_instance_count must less or equal to desired_instance_count")
}
if input.MaxInstanceCount < input.DesiredInstanceCount {
return nil, httperrors.NewOutOfRangeError("max_instance_count must greater than or equal to desired_instance_count")
}
}
region, err := cluster.GetRegion()
if err != nil {
return nil, err