diff --git a/deploy/examples/storageclass-bucket-delete.yaml b/deploy/examples/storageclass-bucket-delete.yaml index 63b25fabdadbe..f9507b754ba74 100644 --- a/deploy/examples/storageclass-bucket-delete.yaml +++ b/deploy/examples/storageclass-bucket-delete.yaml @@ -9,7 +9,7 @@ reclaimPolicy: Delete parameters: objectStoreName: my-store objectStoreNamespace: rook-ceph # namespace:cluster - region: us-east-1 + # region: us-east-1 # To accommodate brownfield cases reference the existing bucket name here instead # of in the ObjectBucketClaim (OBC). In this case the provisioner will grant # access to the bucket by creating a new user, attaching it to the bucket, and diff --git a/deploy/examples/storageclass-bucket-retain.yaml b/deploy/examples/storageclass-bucket-retain.yaml index 37361a8467b48..03a5094f5c050 100644 --- a/deploy/examples/storageclass-bucket-retain.yaml +++ b/deploy/examples/storageclass-bucket-retain.yaml @@ -8,7 +8,7 @@ reclaimPolicy: Retain parameters: objectStoreName: my-store # port 80 assumed objectStoreNamespace: rook-ceph # namespace:cluster - region: us-east-1 + # region: us-east-1 # To accommodate brownfield cases reference the existing bucket name here instead # of in the ObjectBucketClaim (OBC). In this case the provisioner will grant # access to the bucket by creating a new user, attaching it to the bucket, and diff --git a/pkg/operator/ceph/object/bucket/provisioner.go b/pkg/operator/ceph/object/bucket/provisioner.go index 388eff6343644..a9a3f67f28738 100644 --- a/pkg/operator/ceph/object/bucket/provisioner.go +++ b/pkg/operator/ceph/object/bucket/provisioner.go @@ -513,7 +513,11 @@ func (p *Provisioner) setEndpoint(sc *storagev1.StorageClass) { func (p *Provisioner) setRegion(sc *storagev1.StorageClass) { const key = "region" - p.region = sc.Parameters[key] + if len(sc.Parameters[key]) > 0 { + p.region = sc.Parameters[key] + } else { + p.region = p.objectContext.ZoneGroup + } } func (p Provisioner) getObjectStoreEndpoint() string { diff --git a/pkg/operator/ceph/object/health.go b/pkg/operator/ceph/object/health.go index 996686d24c855..d3e9496a69d62 100644 --- a/pkg/operator/ceph/object/health.go +++ b/pkg/operator/ceph/object/health.go @@ -165,7 +165,7 @@ func (c *bucketChecker) checkObjectStoreHealth() error { // Initiate s3 agent logger.Debugf("initializing s3 connection for object store %q", c.namespacedName.Name) - s3client, err := NewInsecureS3Agent(s3AccessKey, s3SecretKey, s3endpoint, "", false) + s3client, err := NewInsecureS3Agent(s3AccessKey, s3SecretKey, s3endpoint, c.objContext.ZoneGroup, false) if err != nil { return errors.Wrap(err, "failed to initialize s3 connection") } diff --git a/pkg/operator/ceph/object/s3-handlers.go b/pkg/operator/ceph/object/s3-handlers.go index 479aaf09bddb5..392951d15b186 100644 --- a/pkg/operator/ceph/object/s3-handlers.go +++ b/pkg/operator/ceph/object/s3-handlers.go @@ -45,11 +45,6 @@ func NewInsecureS3Agent(accessKey, secretKey, endpoint, region string, debug boo } func newS3Agent(accessKey, secretKey, endpoint, region string, debug bool, tlsCert []byte, insecure bool) (*S3Agent, error) { - var cephRegion = "us-east-1" - if region != "" { - cephRegion = region - } - logLevel := aws.LogOff if debug { logLevel = aws.LogDebug @@ -64,7 +59,7 @@ func newS3Agent(accessKey, secretKey, endpoint, region string, debug bool, tlsCe } session, err := awssession.NewSession( aws.NewConfig(). - WithRegion(cephRegion). + WithRegion(region). WithCredentials(credentials.NewStaticCredentials(accessKey, secretKey, "")). WithEndpoint(endpoint). WithS3ForcePathStyle(true). diff --git a/tests/framework/clients/bucket.go b/tests/framework/clients/bucket.go index 037bcdf193972..6f38424302736 100644 --- a/tests/framework/clients/bucket.go +++ b/tests/framework/clients/bucket.go @@ -157,9 +157,9 @@ func (b *BucketOperation) CheckBucketNotificationSetonRGW(namespace, storeName, s3AccessKey, _ := helper.BucketClient.GetAccessKey(obcName) s3SecretKey, _ := helper.BucketClient.GetSecretKey(obcName) if tlsEnabled { - s3client, err = rgw.NewInsecureS3Agent(s3AccessKey, s3SecretKey, s3endpoint, "", true) + s3client, err = rgw.NewInsecureS3Agent(s3AccessKey, s3SecretKey, s3endpoint, storeName, true) } else { - s3client, err = rgw.NewS3Agent(s3AccessKey, s3SecretKey, s3endpoint, "", true, nil) + s3client, err = rgw.NewS3Agent(s3AccessKey, s3SecretKey, s3endpoint, storeName, true, nil) } if err != nil { logger.Infof("failed to s3client due to %v", err)