From 34076f6a680d2e3e2d6edcaf1fa46f5f87e5dfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 7 Nov 2024 15:00:11 +0800 Subject: [PATCH] fix(region): vendor update for gcp disk name length (#21555) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../x/cloudmux/pkg/multicloud/google/instance.go | 9 ++++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3b2a730414..99f688a117 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( k8s.io/cluster-bootstrap v0.19.3 k8s.io/cri-api v0.22.17 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241104064844-1d42dc140003 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063321-e3717fe975d6 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index 9655544303..4e3facdd31 100644 --- a/go.sum +++ b/go.sum @@ -1279,8 +1279,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.20241104064844-1d42dc140003 h1:90P3Kx3kU8OKpIuEqnXkX2YCx+v+g1SYJgO8o6Wa/dU= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241104064844-1d42dc140003/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063321-e3717fe975d6 h1:b4SK8dO2Bqnal+NOuJBUw+XZxSZX3ZiH7sYHlUG5Vb0= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063321-e3717fe975d6/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= 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 7e77bd445b..5c7b533591 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1579,7 +1579,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.20241104064844-1d42dc140003 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241107063321-e3717fe975d6 ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/instance.go index 015dfb0077..b49122ba73 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/instance.go @@ -574,7 +574,14 @@ func (region *SRegion) _createVM(zone string, desc *cloudprovider.SManagedVMCrea nameConv := func(name string) string { name = strings.Replace(name, "_", "-", -1) name = pinyinutils.Text2Pinyin(name) - return strings.ToLower(name) + name = strings.ToLower(name) + if len(name) > 63 { + name = name[:63] + } + if name[len(name)-1] == '-' { + name = name[:len(name)-1] + "1" + } + return name } labels := map[string]string{}