TrueCloudLab/distribution
13
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Allow setting s3 forcepathstyle without regionendpoint (#4291)

Browse source
This commit is contained in:
Milos Gajdos 2024-04-24 08:34:01 +01:00 committed by GitHub
commit e6d1d182bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/content/storage-drivers/s3.md
View file

@ -15,7 +15,7 @@ Amazon S3 or S3 compatible services for object storage.
| `secretkey` | no | Your AWS Secret Key. If you use [IAM roles](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html), omit to fetch temporary credentials from IAM. | | `secretkey` | no | Your AWS Secret Key. If you use [IAM roles](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html), omit to fetch temporary credentials from IAM. |
| `region` | yes | The AWS region in which your bucket exists. | | `region` | yes | The AWS region in which your bucket exists. |
| `regionendpoint` | no | Endpoint for S3 compatible storage services (Minio, etc). | | `regionendpoint` | no | Endpoint for S3 compatible storage services (Minio, etc). |
| `forcepathstyle` | no | To enable path-style addressing when the value is set to `true`. The default is `true`. | | `forcepathstyle` | no | To enable path-style addressing when the value is set to `true`. The default is `false`. |
| `bucket` | yes | The bucket name in which you want to store the registry's data. | | `bucket` | yes | The bucket name in which you want to store the registry's data. |
| `encrypt` | no | Specifies whether the registry stores the image in encrypted format or not. A boolean value. The default is `false`. | | `encrypt` | no | Specifies whether the registry stores the image in encrypted format or not. A boolean value. The default is `false`. |
| `keyid` | no | Optional KMS key ID to use for encryption (encrypt must be true, or this parameter is ignored). The default is `none`. | | `keyid` | no | Optional KMS key ID to use for encryption (encrypt must be true, or this parameter is ignored). The default is `none`. |
@ -43,7 +43,7 @@ Amazon S3 or S3 compatible services for object storage.
`regionendpoint`: (optional) Endpoint URL for S3 compatible APIs. This should not be provided when using Amazon S3. `regionendpoint`: (optional) Endpoint URL for S3 compatible APIs. This should not be provided when using Amazon S3.
`forcepathstyle`: (optional) The force path style for S3 compatible APIs. Some manufacturers only support force path style, while others only support DNS based bucket routing. Amazon S3 supports both. `forcepathstyle`: (optional) Force path style for S3 compatible APIs. Some manufacturers only support force path style, while others only support DNS based bucket routing. Amazon S3 supports both. The value of this parameter applies, regardless of the region settings.
`bucket`: The name of your S3 bucket where you wish to store objects. The bucket must exist prior to the driver initialization. `bucket`: The name of your S3 bucket where you wish to store objects. The bucket must exist prior to the driver initialization.

4
registry/storage/driver/s3-aws/s3.go
View file

@ -205,7 +205,7 @@ func FromParameters(ctx context.Context, parameters map[string]interface{}) (*Dr
regionEndpoint = "" regionEndpoint = ""
} }
forcePathStyleBool := true forcePathStyleBool := false
forcePathStyle := parameters["forcepathstyle"] forcePathStyle := parameters["forcepathstyle"]
switch forcePathStyle := forcePathStyle.(type) { switch forcePathStyle := forcePathStyle.(type) {
case string: case string:
@ -529,9 +529,9 @@ func New(ctx context.Context, params DriverParameters) (*Driver, error) {
if params.RegionEndpoint != "" { if params.RegionEndpoint != "" {
awsConfig.WithEndpoint(params.RegionEndpoint) awsConfig.WithEndpoint(params.RegionEndpoint)
awsConfig.WithS3ForcePathStyle(params.ForcePathStyle)
} }
awsConfig.WithS3ForcePathStyle(params.ForcePathStyle)
awsConfig.WithS3UseAccelerate(params.Accelerate) awsConfig.WithS3UseAccelerate(params.Accelerate)
awsConfig.WithRegion(params.Region) awsConfig.WithRegion(params.Region)
awsConfig.WithDisableSSL(!params.Secure) awsConfig.WithDisableSSL(!params.Secure)

2
registry/storage/driver/s3-aws/s3_test.go
View file

@ -80,7 +80,7 @@ func init() {
return nil, err return nil, err
} }
} }
forcePathStyleBool := true forcePathStyleBool := false
if forcePathStyle != "" { if forcePathStyle != "" {
forcePathStyleBool, err = strconv.ParseBool(forcePathStyle) forcePathStyleBool, err = strconv.ParseBool(forcePathStyle)
if err != nil { if err != nil {

1
tests/conf-e2e-cloud-storage.yml
View file

@ -41,6 +41,7 @@ storage:
bucket: images-local bucket: images-local
rootdirectory: /registry-v2 rootdirectory: /registry-v2
regionendpoint: http://minio:9000 regionendpoint: http://minio:9000
forcepathstyle: true
encrypt: false encrypt: false
secure: false secure: false
chunksize: 33554432 chunksize: 33554432