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): vendor update (#18714)

Browse Source
This commit is contained in:
屈轩
2023-11-17 11:34:25 +08:00
committed by GitHub
parent 4fcec841a4
commit b1d6a2d2c8
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -86,7 +86,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.20231117015828-a46d7098bf71
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231117031849-8f6ec8929ac0
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
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
@@ -1192,8 +1192,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.20231117015828-a46d7098bf71 h1:8avCx3dnQChgEDHve7jJJPgN5+o0QJ+rhGiPS08A+UE=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231117015828-a46d7098bf71/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231117031849-8f6ec8929ac0 h1:bPeaFNz/h4Ex4O0n66dLdSA72FweG0HPeQavjJmUgkw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231117031849-8f6ec8929ac0/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1458,7 +1458,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.20231117015828-a46d7098bf71
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231117031849-8f6ec8929ac0
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer.go
Generated Vendored
+2 -2
View File
@@ -51,7 +51,6 @@ type SLoadbalancer struct {
region *SRegion
Status int64 `json:"Status"` // 0：创建中，1：正常运行
Domain string `json:"Domain"`
VpcId string `json:"VpcId"`
Log string `json:"Log"`
ProjectId int64 `json:"ProjectId"`
@@ -72,6 +71,7 @@ type SLoadbalancer struct {
InternetChargeType string
InternetMaxBandwidthOut int
}
LoadBalancerDomain string `json:"LoadBalancerDomain"`
}
type ZoneSet struct {
@@ -216,7 +216,7 @@ func (self *SLoadbalancer) GetAddress() string {
for _, addr := range self.LoadBalancerVips {
return addr
}
return ""
return self.LoadBalancerDomain
}
func (self *SLoadbalancer) GetAddressType() string {