Merge branch 'main' into K8SPSMDB-1491-incremental

Author: valmiranogueira

e2e-tests/demand-backup-physical-minio-native/conf/restore-backupsource.yml

@@ -0,0 +1,17 @@
+apiVersion: psmdb.percona.com/v1
+kind: PerconaServerMongoDBRestore
+metadata:
+  name:
+spec:
+  clusterName: some-name
+  storageName:
+  backupSource:
+    type: physical
+    destination: s3://BACKUP-NAME
+    minio:
+      credentialsSecret: minio-secret
+      region: us-east-1
+      bucket: operator-testing
+      endpointUrl: minio-service:9000
+      insecureSkipTLSVerify: false
+      secure: false

e2e-tests/demand-backup-physical-minio-native/run

@@ -52,6 +52,13 @@ backup_dest_minio=$(get_backup_dest "${backup_name_minio}")
 run_restore ${backup_name_minio}
 run_recovery_check ${backup_name_minio} "" "" "true"
 
+echo 'Drop collection'
+run_mongo_tls 'use myApp\n db.test.drop()' "myApp:myPass@${cluster}-rs0.${namespace}"
+echo 'check backup and restore using backupSource -- minio'
+backup_dest_minio=$(get_backup_dest "${backup_name_minio}")
+run_restore_backupsource "${backup_name_minio}-source" "${backup_dest_minio}" ""
+run_recovery_check "${backup_name_minio}-source" "" "" "true"
+
 desc 'Testing with arbiter and non-voting nodes'
 
 apply_cluster "${test_dir}/conf/${cluster}-arbiter-nv.yml"

pkg/apis/psmdb/v1/perconaservermongodbrestore_types.go

@@ -123,8 +123,9 @@ func (r *PerconaServerMongoDBRestore) CheckFields() error {
 			r.Spec.BackupSource.S3 == nil &&
 			r.Spec.BackupSource.GCS == nil &&
 			r.Spec.BackupSource.Azure == nil &&
+			r.Spec.BackupSource.Minio == nil &&
 			r.Spec.BackupSource.Filesystem == nil {
-			return errors.New("one of storageName, backupSource.s3, backupSource.gcs, backupSource.azure or backupSource.filesystem is required")
+			return errors.New("one of storageName, backupSource.minio, backupSource.s3, backupSource.gcs, backupSource.azure or backupSource.filesystem is required")
 		}
 	}
 

pkg/controller/perconaservermongodbrestore/psmdb_restore_controller.go

@@ -334,6 +334,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) getBackup(ctx context.Context, cr
 				Destination: cr.Spec.BackupSource.Destination,
 				StorageName: cr.Spec.StorageName,
 				S3:          cr.Spec.BackupSource.S3,
+				Minio:       cr.Spec.BackupSource.Minio,
 				GCS:         cr.Spec.BackupSource.GCS,
 				Azure:       cr.Spec.BackupSource.Azure,
 				Filesystem:  cr.Spec.BackupSource.Filesystem,