opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update (#17332)

Browse Source
This commit is contained in:
屈轩
2023-06-21 10:04:22 +08:00
committed by GitHub
parent 3a42de8648
commit a2dccb65a2
5 changed files with 5 additions and 8 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.20230615122416-b42c36313681
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230619085604-6252d7274953
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
go.sum
+2 -2
View File
@@ -1173,8 +1173,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.20230615122416-b42c36313681 h1:kVR8utQcEJwcRv/s8KNtYQLZq7FSrV0rM0VKv1/U0io=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230615122416-b42c36313681/go.mod h1:crMeQeaNaZefTXfXbQkoj5SStggqkSNVABHtYBFjM3Y=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230619085604-6252d7274953 h1:P4nUXIFWL2MRJBDsOqPBt+p27x1YN1nuGfLHMX5St1U=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230619085604-6252d7274953/go.mod h1:crMeQeaNaZefTXfXbQkoj5SStggqkSNVABHtYBFjM3Y=
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=
pkg/compute/models/cloudsync.go
-3
View File
@@ -135,9 +135,6 @@ func syncRegionZones(ctx context.Context, userCred mcclient.TokenCredential, syn
msg := result.Result()
notes := fmt.Sprintf("SyncZones for region %s result: %s", localRegion.Name, msg)
log.Infof(notes)
if result.IsError() {
return nil, nil, fmt.Errorf(msg)
}
db.OpsLog.LogEvent(provider, db.ACT_SYNC_HOST_COMPLETE, msg, userCred)
return localZones, remoteZones, nil
}
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1440,7 +1440,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.20230615122416-b42c36313681
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230619085604-6252d7274953
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go
Generated Vendored
+1 -1
View File
@@ -216,7 +216,7 @@ func (self *SInstance) GetBios() cloudprovider.TBiosType {
}
func (self *SInstance) GetBootOrder() string {
return strings.ToLower(self.Boot)
return "cdn"
}
func (self *SInstance) GetError() error {