fix(region): vender update (#15559)

This commit is contained in:
屈轩
2022-12-17 17:26:58 +08:00
committed by GitHub
parent 77a0cf0646
commit 4d78465d92
4 changed files with 12 additions and 13 deletions
+1 -1
View File
@@ -84,7 +84,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.20221214123921-87b816428b1e
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221216034754-bf0918b649ac
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
+2 -2
View File
@@ -1176,8 +1176,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.20221214123921-87b816428b1e h1:drZgFMUCXgQ3wvnrhwKleSh2KtfiemIk2m4k+pkG4ck=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221216034754-bf0918b649ac h1:RlNoXjmep9eB5tr/JAnO7K29nQHkIhh4EaCGAAInC2I=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221216034754-bf0918b649ac/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ=
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=
+1 -1
View File
@@ -1439,7 +1439,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.20221214123921-87b816428b1e
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221216034754-bf0918b649ac
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
+8 -9
View File
@@ -15,7 +15,6 @@
package huawei
import (
"fmt"
"time"
"yunion.io/x/log"
@@ -50,8 +49,8 @@ type MetricData struct {
func (self *SHuaweiClient) getServerMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) {
params := map[string]interface{}{
"from": fmt.Sprintf("%d", opts.StartTime.UnixMilli()),
"to": fmt.Sprintf("%d", opts.EndTime.UnixMilli()),
"from": opts.StartTime.UnixMilli(),
"to": opts.EndTime.UnixMilli(),
"period": "1",
"filter": "average",
}
@@ -131,8 +130,8 @@ func (self *SHuaweiClient) getServerMetrics(opts *cloudprovider.MetricListOption
func (self *SHuaweiClient) getRedisMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) {
params := map[string]interface{}{
"from": fmt.Sprintf("%d", opts.StartTime.UnixMilli()),
"to": fmt.Sprintf("%d", opts.EndTime.UnixMilli()),
"from": opts.StartTime.UnixMilli(),
"to": opts.EndTime.UnixMilli(),
"period": "1",
"filter": "average",
}
@@ -216,8 +215,8 @@ func (self *SHuaweiClient) getRedisMetrics(opts *cloudprovider.MetricListOptions
func (self *SHuaweiClient) getRdsMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) {
params := map[string]interface{}{
"from": fmt.Sprintf("%d", opts.StartTime.UnixMilli()),
"to": fmt.Sprintf("%d", opts.EndTime.UnixMilli()),
"from": opts.StartTime.UnixMilli(),
"to": opts.EndTime.UnixMilli(),
"period": "1",
"filter": "average",
}
@@ -399,8 +398,8 @@ func (self *SHuaweiClient) getBucketMetrics(opts *cloudprovider.MetricListOption
func (self *SHuaweiClient) getLoadbalancerMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) {
params := map[string]interface{}{
"from": fmt.Sprintf("%d", opts.StartTime.UnixMilli()),
"to": fmt.Sprintf("%d", opts.EndTime.UnixMilli()),
"from": opts.StartTime.UnixMilli(),
"to": opts.EndTime.UnixMilli(),
"period": "1",
"filter": "average",
}