diff --git a/go.mod b/go.mod index e267108498..e3afd28ebf 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.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 diff --git a/go.sum b/go.sum index f137569f3a..7c8e918bdb 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.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= diff --git a/vendor/modules.txt b/vendor/modules.txt index 3fa3c2b5df..43d45d2cff 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.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 diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kube_cluster.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kube_cluster.go index 3a30660709..9a40498bbe 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kube_cluster.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/kube_cluster.go @@ -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, diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instancenic.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instancenic.go index 7554e7d2e3..eedb9ec6d3 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instancenic.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instancenic.go @@ -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 ""