Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions e2e-tests/demand-backup/conf/some-name-rs0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ spec:
prefix: psmdb-demand-backup
insecureSkipTLSVerify: false
minio:
type: s3
s3:
type: minio
minio:
credentialsSecret: minio-secret
region: us-east-1
bucket: operator-testing
endpointUrl: http://minio-service:9000/
endpointUrl: minio-service:9000
insecureSkipTLSVerify: false
secure: false
gcp-cs-s3:
type: s3
s3:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/percona/percona-backup-mongodb/pbm/storage"
"github.com/percona/percona-backup-mongodb/pbm/storage/azure"
"github.com/percona/percona-backup-mongodb/pbm/storage/gcs"
"github.com/percona/percona-backup-mongodb/pbm/storage/mio"
"github.com/percona/percona-backup-mongodb/pbm/storage/s3"

"github.com/percona/percona-server-mongodb-operator/clientcmd"
Expand Down Expand Up @@ -349,6 +350,7 @@ func (r *ReconcilePerconaServerMongoDBBackup) getPBMStorage(ctx context.Context,
}

return gcs.New(gcsConf, "", nil)

case cr.Status.S3 != nil:
s3Conf := &s3.Config{
Region: cr.Status.S3.Region,
Expand Down Expand Up @@ -438,6 +440,34 @@ func (r *ReconcilePerconaServerMongoDBBackup) getPBMStorage(ctx context.Context,
}

return s3.New(s3Conf, "", nil)
case cr.Status.Minio != nil:
minioConf := &mio.Config{
Region: cr.Status.Minio.Region,
Endpoint: cr.Status.Minio.EndpointURL,
Bucket: cr.Status.Minio.Bucket,
Prefix: cr.Status.Minio.Prefix,
InsecureSkipTLSVerify: cr.Status.Minio.InsecureSkipTLSVerify,
DebugTrace: cr.Status.Minio.DebugTrace,
PartSize: cr.Status.Minio.PartSize,
Secure: cr.Status.Minio.Secure,
ForcePathStyle: cr.Status.Minio.ForcePathStyle,
}
if cr.Status.Minio.Retryer != nil {
minioConf.Retryer = &mio.Retryer{
NumMaxRetries: cr.Status.Minio.Retryer.NumMaxRetries,
}
}
if cr.Status.Minio.CredentialsSecret != "" {
minioSecret, err := secret(ctx, r.client, cr.GetNamespace(), cr.Status.Minio.CredentialsSecret)
if err != nil {
return nil, errors.Wrap(err, "get minio credentials secret")
}
minioConf.Credentials = mio.Credentials{
AccessKeyID: string(minioSecret.Data[backup.AWSAccessKeySecretKey]),
SecretAccessKey: string(minioSecret.Data[backup.AWSSecretAccessKeySecretKey]),
}
}
return mio.New(minioConf, "", nil)
default:
return nil, errors.New("no storage info in backup status")
}
Expand Down
1 change: 1 addition & 0 deletions pkg/psmdb/backup/pbm.go
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ func GetPBMStorageMinioConfig(
DebugTrace: stg.Minio.DebugTrace,
PartSize: stg.Minio.PartSize,
Secure: stg.Minio.Secure,
ForcePathStyle: stg.Minio.ForcePathStyle,
},
}

Expand Down
Loading