Merge branch 'main' into K8SPSMDB-1472

Author: hors

deploy/cr.yaml

@@ -778,7 +778,7 @@ spec:
 #    containerSecurityContext:
 #      privileged: false
 #    storages:
-#      s3-us-west:
+#      s3-us-east:
 #        main: true
 #        type: s3
 #        s3:
@@ -810,15 +810,6 @@ spec:
 #            backoffInitial: 1
 #            backoffMax: 30
 #            backoffMultiplier: 2
-#      minio-s3:
-#        type: s3
-#        s3:
-#          bucket: MINIO-BACKUP-BUCKET-NAME-HERE
-#          region: us-east-1
-#          credentialsSecret: my-cluster-name-backup-minio
-#          endpointUrl: http://minio.psmdb.svc.cluster.local:9000/minio/
-#          insecureSkipTLSVerify: false
-#          prefix: ""
 #      minio:
 #        type: minio
 #        minio:

e2e-tests/demand-backup/conf/some-name-rs0.yml

@@ -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:

pkg/controller/perconaservermongodbbackup/psmdb_backup_controller.go

@@ -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"
@@ -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,
@@ -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")
 	}

pkg/psmdb/backup/pbm.go

@@ -356,6 +356,7 @@ func GetPBMStorageMinioConfig(
 			DebugTrace:            stg.Minio.DebugTrace,
 			PartSize:              stg.Minio.PartSize,
 			Secure:                stg.Minio.Secure,
+			ForcePathStyle:        stg.Minio.ForcePathStyle,
 		},
 	}