opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17370 from ioito/hotfix/qx-zstack-ip

Browse Source 
fix(region): sync zstack vm ip
This commit is contained in:
Zexi Li
2023-06-26 16:40:05 +08:00
committed by GitHub
parent 8eb8cd5c89 e246dae81a
commit ba0cf30305
5 changed files with 8 additions and 6 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.20230625125434-6bdb068c8c6c
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230626080125-46007412ea09
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.20230625125434-6bdb068c8c6c h1:tXPfrucfVwKslNTh4zPTViU2hLzKWfT/HGIq2cP8m9k=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230625125434-6bdb068c8c6c/go.mod h1:crMeQeaNaZefTXfXbQkoj5SStggqkSNVABHtYBFjM3Y=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230626080125-46007412ea09 h1:KI5BH9INDPW3ijjzza8CloadQHMCK7KUWmSL+++6mtw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230626080125-46007412ea09/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=
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.20230625125434-6bdb068c8c6c
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230626080125-46007412ea09
## 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/kube_cluster.go
Generated Vendored
+1 -1
View File
@@ -401,7 +401,7 @@ func (self *SRegion) CreateKubeCluster(opts *cloudprovider.KubeClusterCreateOpti
"api_audiences": "https://kubernetes.default.svc",
"service_account_issuer": "https://kubernetes.default.svc",
"key_pair": keyName,
"snat_entry": false,
"snat_entry": true,
"ssh_flags": true,
"tags": tags,
"cloud_monitor_flags": true,
vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instancenic.go
Generated Vendored
+3 -1
View File
@@ -15,6 +15,8 @@
package zstack
import (
"fmt"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -67,7 +69,7 @@ func (nic *SInstanceNic) GetINetworkId() string {
}
for i := 0; i < len(networks); i++ {
if networks[i].Contains(nic.IP) {
return networks[i].L3NetworkUUID
return fmt.Sprintf("%s/%s", networks[i].L3NetworkUUID, networks[i].UUID)
}
}
return ""