diff --git a/cmd/climc/shell/misc/feature.go b/cmd/climc/shell/misc/feature.go index ed7eff6f33..f235614995 100644 --- a/cmd/climc/shell/misc/feature.go +++ b/cmd/climc/shell/misc/feature.go @@ -104,6 +104,7 @@ func init() { "volcengine", "oraclecloud", "sangfor", + "cephfs", } features = append(features, storageFeatures...) diff --git a/go.mod b/go.mod index 2730830033..57d341b181 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( k8s.io/cri-api v0.22.17 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.20240918093754-91627585360f + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240925082430-67169b24a255 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index f85a0de9f8..c06b107edc 100644 --- a/go.sum +++ b/go.sum @@ -1376,8 +1376,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.20240918093754-91627585360f h1:Pq19nsrD8LLTUt9AsCMN3c3iVUjKjQuuyU1VRJdKITc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240918093754-91627585360f/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240925082430-67169b24a255 h1:VCEZUdX/5+4UCUJlxxkRQek4KQGEfEtTbd6BsnsZlZY= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240925082430-67169b24a255/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 bd0d070c0f..f484e9865d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1785,7 +1785,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.20240918093754-91627585360f +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240925082430-67169b24a255 ## 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/cephfs/client.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/client.go index 46b5cfb45d..2136240ee4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/client.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cephfs/client.go @@ -120,7 +120,11 @@ func (cli *SCephFSClient) getDefaultClient() *http.Client { } func (cli *SCephFSClient) baseUrl() string { - return fmt.Sprintf("https://%s:%d/api", cli.host, cli.port) + protocol := "http" + if strings.Contains(fmt.Sprintf("%d", cli.port), "443") { + protocol = "https" + } + return fmt.Sprintf("%s://%s:%d/api", protocol, cli.host, cli.port) } func (cli *SCephFSClient) auth() error {