From ab6f22c5db1eea416af42e9431e5a9502e02be28 Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Mon, 29 Sep 2025 19:22:14 +0800 Subject: [PATCH] fix: s3 common options (#23443) Co-authored-by: Qiu Jian --- pkg/cloudcommon/options/options.go | 4 ++-- pkg/image/options/options.go | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/cloudcommon/options/options.go b/pkg/cloudcommon/options/options.go index 585f5c0b5c..a3c36245d4 100644 --- a/pkg/cloudcommon/options/options.go +++ b/pkg/cloudcommon/options/options.go @@ -150,7 +150,7 @@ type CommonOptions struct { type HostCommonOptions struct { CommonOptions - S3ScreenDumpOptions + S3CommonOptions ExecutorSocketPath string `help:"Executor socket path" default:"/var/run/onecloud/exec.sock"` DeployServerSocketPath string `help:"Deploy server listen socket path" default:"/var/run/onecloud/deploy.sock"` @@ -164,7 +164,7 @@ type HostCommonOptions struct { Qcow2Preallocation string `help:"Qcow2 image create preallocation" default:"metadata" choices:"disable|metadata|falloc|full"` } -type S3ScreenDumpOptions struct { +type S3CommonOptions struct { S3AccessKey string `help:"s3 access key"` S3SecretKey string `help:"s3 secret key"` S3Endpoint string `help:"s3 endpoint"` diff --git a/pkg/image/options/options.go b/pkg/image/options/options.go index 3f291d69f7..ee74f7bec6 100644 --- a/pkg/image/options/options.go +++ b/pkg/image/options/options.go @@ -46,11 +46,6 @@ type SImageOptions struct { StorageDriver string `help:"image backend storage" default:"local" choices:"s3|local"` - S3AccessKey string `help:"s3 access key"` - S3SecretKey string `help:"s3 secret key"` - S3Endpoint string `help:"s3 endpoint"` - S3UseSSL bool `help:"s3 access use ssl"` - S3BucketName string `help:"s3 bucket name" default:"onecloud-images"` S3MountPoint string `help:"s3fs mount point" default:"/opt/cloud/workspace/data/glance/s3images"` S3CheckImageStatus bool `help:"Enable s3 check image status"`