diff --git a/go.mod b/go.mod index e3d7caf35f..e0e23225d0 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( k8s.io/cri-api v0.28.15 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260121071824-81b6a939374a + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023305-3637fbeb5a74 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index 522f3be82f..c632e89459 100644 --- a/go.sum +++ b/go.sum @@ -1661,8 +1661,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.20260121071824-81b6a939374a h1:xd+aDmE0tlNKqRvcTWOnQ+LBqtX/JHCQIL9deWrMdaE= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260121071824-81b6a939374a/go.mod h1:aWRX5Phwz3nbHUNnIAm1oVogjguXPYDDgCOy/9Hnnvk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023305-3637fbeb5a74 h1:t/JcnzfXFKsQPyt+CUvLK1gfftHGhZBs8/0rhKa4MI4= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023305-3637fbeb5a74/go.mod h1:aWRX5Phwz3nbHUNnIAm1oVogjguXPYDDgCOy/9Hnnvk= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/compute/models/guest_queries.go b/pkg/compute/models/guest_queries.go index dcca7421dc..b4ce31c8c6 100644 --- a/pkg/compute/models/guest_queries.go +++ b/pkg/compute/models/guest_queries.go @@ -574,6 +574,7 @@ func fetchGuestNICs(ctx context.Context, guestIds []string, virtual tristate.Tri gnwq.Field("network_id"), // caution: do not alias netq.id as network_id gnwq.Field("port_mappings"), + gnwq.Field("ifname"), gnwq.Field("is_default"), diff --git a/vendor/modules.txt b/vendor/modules.txt index 3734265522..d6c0e3639b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2243,7 +2243,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.20260121071824-81b6a939374a +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260123023305-3637fbeb5a74 ## explicit; go 1.24 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go index 28a39c801d..ec11582df7 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/region.go @@ -36,6 +36,7 @@ var RegionLocations = map[string]string{ "cn-shanghai": "华东2(上海)", "cn-guangzhou": "华南1(广州)", "ap-southeast-1": "亚太东南(柔佛)", + "ap-southeast-3": "亚太东南(雅加达)", "cn-hongkong": "中国香港", } @@ -45,6 +46,7 @@ var RegionEndpoint = map[string]string{ "cn-guangzhou": "cn-beijing.volces.com", "ap-southeast-1": "ap-southeast-1.volces.com", "cn-hongkong": "cn-hongkong.volces.com", + "ap-southeast-3": "ap-southeast-3.volces.com", } type sStorageType struct { @@ -509,7 +511,11 @@ func (region *SRegion) instanceOperation(instanceId string, apiName string, extr } func (region *SRegion) getBaseEndpoint() string { - return RegionEndpoint[region.RegionId] + endpoint, ok := RegionEndpoint[region.RegionId] + if ok { + return endpoint + } + return fmt.Sprintf("%s.volces.com", region.RegionId) } func (region *SRegion) getS3Endpoint() string {