From a2dccb65a2a0b3168abc57a477a13d048488b90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Wed, 21 Jun 2023 10:04:22 +0800
Subject: [PATCH] fix(region): vendor update (#17332)

---
 go.mod                                                        | 2 +-
 go.sum                                                        | 4 ++--
 pkg/compute/models/cloudsync.go                               | 3 ---
 vendor/modules.txt                                            | 2 +-
 .../yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go   | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index e649a00e41..79c91c249c 100644
--- a/go.mod
+++ b/go.mod
@@ -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
diff --git a/go.sum b/go.sum
index 8077757930..0ad3e7f407 100644
--- a/go.sum
+++ b/go.sum
@@ -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=
diff --git a/pkg/compute/models/cloudsync.go b/pkg/compute/models/cloudsync.go
index 7c754ecf62..ac4ef9fa2a 100644
--- a/pkg/compute/models/cloudsync.go
+++ b/pkg/compute/models/cloudsync.go
@@ -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
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
index f00acc2c21..cb058c9a5d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -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
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go
index dc8c47983d..ab99df9b3f 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go
@@ -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 {