From f7ec171dee812295c41f8835db09a107d332ddc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 8 Jan 2024 11:35:04 +0800 Subject: [PATCH] fix(region): volcengine network range (#19187) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../yunion.io/x/cloudmux/pkg/multicloud/volcengine/network.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a2ac58a3d3..84673900d2 100644 --- a/go.mod +++ b/go.mod @@ -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.20240105111824-cb1483a98133 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240107043220-76ee39a6b988 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 diff --git a/go.sum b/go.sum index 5dbea2c659..eec7bfe2ca 100644 --- a/go.sum +++ b/go.sum @@ -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.20240105111824-cb1483a98133 h1:WTivxG898KenL6je0OjSjPJ29wNeDxFLImnVb923Aes= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240105111824-cb1483a98133/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240107043220-76ee39a6b988 h1:6KNxFZYUhXYiUPzuK/pJfhskFPtdTsSoAOZMpU0RpLM= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240107043220-76ee39a6b988/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= diff --git a/vendor/modules.txt b/vendor/modules.txt index 3cfc6840a8..1b53dff9eb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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.20240105111824-cb1483a98133 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240107043220-76ee39a6b988 ## 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/volcengine/network.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/network.go index 3736d5d5db..4003f23e2c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/network.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/network.go @@ -92,6 +92,7 @@ func (subnet *SNetwork) GetIpStart() string { pref, _ := netutils.NewIPV4Prefix(subnet.CidrBlock) startIp := pref.Address.NetAddr(pref.MaskLen) startIp = startIp.StepUp() + startIp = startIp.StepUp() return startIp.String() } @@ -99,7 +100,6 @@ func (subnet *SNetwork) GetIpEnd() string { pref, _ := netutils.NewIPV4Prefix(subnet.CidrBlock) endIp := pref.Address.BroadcastAddr(pref.MaskLen) endIp = endIp.StepDown() - endIp = endIp.StepDown() return endIp.String() }