diff --git a/go.mod b/go.mod index ca3a8b969d..b1bba0b1ed 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229033822-9125be57abc8 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070431-7ec90c4ba88a yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index 66fd6d0125..ff53be07f8 100644 --- a/go.sum +++ b/go.sum @@ -1158,8 +1158,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.20221229033822-9125be57abc8 h1:mwfMHctVw2QGMIt9HWgY8BshxB1vXXxJtBqXtJ8Lm1g= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229033822-9125be57abc8/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070431-7ec90c4ba88a h1:jkfjsQWUQTuLhqYWn0O2M/avyQlEIhWkfbwubVZ73sc= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070431-7ec90c4ba88a/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/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 d94cdaf21c..71db9dab97 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,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.20221229033822-9125be57abc8 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070431-7ec90c4ba88a ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go index b7cb38a7db..69d1a8be1e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elasticcache_instance.go @@ -624,7 +624,12 @@ func (self *SRegion) CreateIElasticcaches(ec *cloudprovider.SCloudElasticCacheIn params["RegionId"] = self.RegionId params["InstanceClass"] = ec.InstanceType params["InstanceName"] = ec.InstanceName - params["InstanceType"] = ec.Engine + switch ec.Engine { + case api.ELASTIC_CACHE_ENGINE_REDIS: + params["InstanceType"] = "Redis" + case api.ELASTIC_CACHE_ENGINE_MEMCACHED: + params["InstanceType"] = "Memcache" + } params["EngineVersion"] = ec.EngineVersion if len(ec.Password) > 0 {