From ca29c4d44124b23bcdbd4b747b07887198d12b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 10 Nov 2023 16:09:45 +0800 Subject: [PATCH] fix(region): vendor update (#18629) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c18a1389f7..a0a9a50cdb 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,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.20231110021216-8c7ba5012f0d + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231110073234-e4b6f8dae0b5 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 da9ccaa72a..ab870ca65b 100644 --- a/go.sum +++ b/go.sum @@ -1190,8 +1190,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.20231110021216-8c7ba5012f0d h1:SIAGkWagYmqrnT3Fblfc7l5PT8jnfq/1MCvlHnYRGF4= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231110021216-8c7ba5012f0d/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231110073234-e4b6f8dae0b5 h1:zx+h63rPTE0f0glf9ttHnAOIxdXhTAeM1wC3ZAV9J2c= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231110073234-e4b6f8dae0b5/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY= 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 08f96557c8..94c6213eee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1455,7 +1455,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.20231110021216-8c7ba5012f0d +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231110073234-e4b6f8dae0b5 ## 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/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go index 513dabe806..628fcdfb9e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/image.go @@ -245,6 +245,7 @@ func (region *SRegion) GetImage(imageId string) (*SImage, error) { } for i := range images { if images[i].ImageId == imageId { + images[i].storageCache = region.getStoragecache() return &images[i], nil } }