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

fix(region): vmware template image size

Browse Source
This commit is contained in:
ioito
2023-02-28 19:45:45 +08:00
parent f62e064ebd
commit b3427b9549
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -83,7 +83,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.20230224103233-7b0e7e7e76b6
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45
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
go.sum
+2 -2
View File
@@ -1164,8 +1164,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.20230224103233-7b0e7e7e76b6 h1:z6WheXgjKgjvdjKHUFqlju1xLGtHujIN3Q+2rhcg9nQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45 h1:O45uaLmag5nrQoO0sn8nkrLvG4yp+im/1QizinLnLM0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45/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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1442,7 +1442,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.20230224103233-7b0e7e7e76b6
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go
Generated Vendored
+4 -3
View File
@@ -122,12 +122,13 @@ func (t *SVMTemplate) GetIStoragecache() cloudprovider.ICloudStoragecache {
}
func (t *SVMTemplate) GetSizeByte() int64 {
var sum int
for i := range t.vm.vdisks {
vdisk := t.vm.vdisks[i]
sum += vdisk.GetDiskSizeMB()
if vdisk.IsRoot {
return int64(vdisk.GetDiskSizeMB()) * (1 << 20)
}
}
return int64(sum) * (1 << 20)
return 0
}
func (t *SVMTemplate) GetImageType() cloudprovider.TImageType {