From 2b29b9b6fbae23e7dcce9441b71244fd80877558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 25 Dec 2024 10:54:36 +0800 Subject: [PATCH] fix(region): qcloud rds cpu option (#21891) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8091473fd5..2d7bf6ca46 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241224075750-4d47750bdc09 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241225022314-afb2521c4810 yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index 7f9814dc13..0e5cb4d30c 100644 --- a/go.sum +++ b/go.sum @@ -1376,8 +1376,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241224075750-4d47750bdc09 h1:j5zw172RWdBimE8Z3rAOjTHjmQkHqlx+DZcMwITgTQY= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241224075750-4d47750bdc09/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241225022314-afb2521c4810 h1:Y5Q+aOgh6a/0fEi7JUI9QVcJ3qDhjjv+0MxZNbDhllk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241225022314-afb2521c4810/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y= yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8= yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index 7e73712d67..d8c743f8c5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1785,7 +1785,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241224075750-4d47750bdc09 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241225022314-afb2521c4810 ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go index 5d0f822722..95ab931387 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go @@ -755,6 +755,7 @@ func (self *SRegion) CreateMySQLDBInstance(opts *cloudprovider.SManagedDBInstanc "GoodsNum": "1", "Memory": fmt.Sprintf("%d", opts.VmemSizeMb), "Volume": fmt.Sprintf("%d", opts.DiskSizeGB), + "Cpu": fmt.Sprintf("%d", opts.VcpuCount), "EngineVersion": opts.EngineVersion, } if len(opts.VpcId) > 0 {