fix(region): sync cloudpods host storage driver (#20465)

yunionio · Jun 4, 2024 · dd66d16 · dd66d16
1 parent 71bd725
commit dd66d16
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -94,7 +94,7 @@ require (
 	k8s.io/cri-api v0.22.17
 	k8s.io/klog/v2 v2.2.0
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240603072803-dd17647bb71c
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240604034047-e1e06dfdf1f9
 	yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
 	yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
 	yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91

diff --git a/go.sum b/go.sum
@@ -1309,8 +1309,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.20240603072803-dd17647bb71c h1:GRMRxsn9qZVHiqI/+bBnDUT9gGCtoO2RYdoIK96fUco=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240603072803-dd17647bb71c/go.mod h1:quoJjGTJ2PjAY0+3YeN5JuN136whECKmfkJQwIsXKjM=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240604034047-e1e06dfdf1f9 h1:D5VDFE0Ab9rmBT3/MtO4Dqk1oZxLxS90Io3ToC915q8=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240604034047-e1e06dfdf1f9/go.mod h1:quoJjGTJ2PjAY0+3YeN5JuN136whECKmfkJQwIsXKjM=
 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go
@@ -2018,6 +2018,9 @@ func (hh *SHost) SyncWithCloudHost(ctx context.Context, userCred mcclient.TokenC
 			hh.IsBaremetal = true
 		}
 		hh.StorageInfo = extHost.GetStorageInfo()
+		if storageDriver := extHost.GetStorageDriver(); len(storageDriver) > 0 {
+			hh.StorageDriver = storageDriver
+		}
 		hh.OvnVersion = extHost.GetOvnVersion()
 
 		if cpuCmt := extHost.GetCpuCmtbound(); cpuCmt > 0 {
@@ -2274,6 +2277,7 @@ func (manager *SHostManager) NewFromCloudHost(ctx context.Context, userCred mccl
 	host.MemSize = extHost.GetMemSizeMB()
 	host.StorageSize = extHost.GetStorageSizeMB()
 	host.StorageType = extHost.GetStorageType()
+	host.StorageDriver = extHost.GetStorageDriver()
 	host.CpuCmtbound = 8.0
 	if cpuCmt := extHost.GetCpuCmtbound(); cpuCmt > 0 {
 		host.CpuCmtbound = cpuCmt

diff --git a/pkg/mcclient/cloudpods/host.go b/pkg/mcclient/cloudpods/host.go
@@ -157,6 +157,10 @@ func (host *SHost) GetStorageSizeMB() int64 {
 	return host.StorageSize
 }
 
+func (host *SHost) GetStorageDriver() string {
+	return host.StorageDriver
+}
+
 func (host *SHost) GetStorageInfo() jsonutils.JSONObject {
 	return host.StorageInfo
 }

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1690,7 +1690,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.20240603072803-dd17647bb71c
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240604034047-e1e06dfdf1f9
 ## 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/apis/compute/mongodb_const.go b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/mongodb_const.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/host_base.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/host_base.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/mongodb.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/mongodb.go