lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 03:24:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update for huawei project sync (#19140)

Browse Source
This commit is contained in:
屈轩
2023-12-29 17:09:40 +08:00
committed by GitHub
parent 5593f125db
commit 28a25ebade
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -88,7 +88,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.20231227060648-f9599db00421
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231229064730-739383d4356c
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

4
go.sum
View File

@@ -1201,8 +1201,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.20231227060648-f9599db00421 h1:Y4Bz5nMZAhdIN/6iODYKtcA2TZaT3Io1D1BSXKJP+Ak=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231227060648-f9599db00421/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231229064730-739383d4356c h1:EH6bmVx8fNlkej3oWilVwqVbCev9KT7QpOd8cqS7oMw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231229064730-739383d4356c/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=

2
vendor/modules.txt vendored
View File

@@ -1465,7 +1465,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.20231227060648-f9599db00421
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231229064730-739383d4356c
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/eip.go generated vendored
View File

@@ -330,6 +330,7 @@ func (self *SRegion) GetEips(portId string, addrs []string) ([]SEipAddress, erro
if len(portId) > 0 {
query.Set("port_id", portId)
}
query.Set("ip_version", "4")
eips := []SEipAddress{}
for {
resp, err := self.list(SERVICE_VPC_V3, "eip/publicips", query)

3
vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/huawei.go generated vendored
View File

@@ -148,7 +148,8 @@ func (self *SHuaweiClient) init() error {
if err != nil {
return errors.Wrapf(err, "GetProjects")
}
return nil
_, err = self.GetOwnerId()
return err
}
func (self *SHuaweiClient) getDefaultClient() *http.Client {

2
vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/instance.go generated vendored
View File

@@ -407,7 +407,7 @@ func (self *SInstance) GetIEIP() (cloudprovider.ICloudEIP, error) {
ips := make([]string, 0)
for _, addresses := range self.Addresses {
for _, address := range addresses {
if address.OSEXTIPSType != "fixed" && !strings.HasPrefix(address.Addr, "100.") {
if address.OSEXTIPSType != "fixed" && !strings.HasPrefix(address.Addr, "100.") && address.Version == "4" {
ips = append(ips, address.Addr)
}
}