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

Merge pull request #19258 from ioito/automated-cherry-pick-of-#19257-upstream-release-3.11

Browse Source 
Automated cherry pick of #19257: fix(region): vendor update for aliyun security group rule create
This commit is contained in:
Zexi Li
2024-01-15 19:21:56 +08:00
committed by GitHub
parent cef7656187 e8f3e390ba
commit e5829292e9
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
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.20240112111333-5c48e40fddb1
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f
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
@@ -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.20240112111333-5c48e40fddb1 h1:Fo8fYTq1ppvTv7CFv63Bu0mxtwbeNESP8NxmAG6D+l8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240112111333-5c48e40fddb1/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f h1:8o0QBLcujkaQMG0zMdkj2r177DW/i4YDsWVAE7tI1tE=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f/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
@@ -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.20240112111333-5c48e40fddb1
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240115110840-8f78bbd6d92f
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/securitygroup.go
Generated Vendored
+1 -1
View File
@@ -354,7 +354,7 @@ func (self *SSecurityGroup) CreateRule(opts *cloudprovider.SecurityGroupRuleCrea
}
for i := range rules {
rule := rules[i]
if utils.IsInStringArray(rule.SecurityGroupRuleId, ruleIds) {
if !utils.IsInStringArray(rule.SecurityGroupRuleId, ruleIds) {
rule.region = self.region
return &rule, nil
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go
Generated Vendored
+4 -2
View File
@@ -822,9 +822,11 @@ func (self *SRegion) GetInstances(hostId string) ([]SInstance, error) {
for _, res := range resources {
if res.NodeId == hostId || len(hostId) == 0 {
instance, err := self.GetQemuConfig(res.Node, res.VmId)
if err == nil {
ret = append(ret, *instance)
if err != nil {
log.Warningf("get pve vm %s %d error: %v", res.Node, res.VmId, err)
continue
}
ret = append(ret, *instance)
}
}