Only use managed DB/Storage Secret if not specified in DSPA

controllers/database.go

@@ -20,6 +20,7 @@ import (
 	"database/sql"
 	b64 "encoding/base64"
 	"fmt"
+
 	_ "github.com/go-sql-driver/mysql"
 	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
 	"github.com/opendatahub-io/data-science-pipelines-operator/controllers/config"
@@ -32,7 +33,6 @@ var mariadbTemplates = []string{
 	"mariadb/pvc.yaml.tmpl",
 	"mariadb/service.yaml.tmpl",
 	"mariadb/mariadb-sa.yaml.tmpl",
-	dbSecret,
 }
 
 // extract to var for mocking in testing
@@ -100,10 +100,20 @@ func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1alpha
 	// Default DB is currently MariaDB as well, but storing these bools seperately in case that changes
 	deployDefaultDB := !databaseSpecified || defaultDBRequired
 
+	externalDBCredentialsProvided := externalDBSpecified && (dsp.Spec.Database.ExternalDB.PasswordSecret != nil)
+	mariaDBCredentialsProvided := mariaDBSpecified && (dsp.Spec.Database.MariaDB.PasswordSecret != nil)
+	databaseCredentialsProvided := externalDBCredentialsProvided || mariaDBCredentialsProvided
+
 	// If external db is specified, it takes precedence
 	if externalDBSpecified {
 		log.Info("Using externalDB, bypassing database deployment.")
 	} else if deployMariaDB || deployDefaultDB {
+		if !databaseCredentialsProvided {
+			err := r.Apply(dsp, params, dbSecret)
+			if err != nil {
+				return err
+			}
+		}
 		log.Info("Applying mariaDB resources.")
 		for _, template := range mariadbTemplates {
 			err := r.Apply(dsp, params, template)

controllers/storage.go

@@ -22,6 +22,8 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"net/http"
+
 	"github.com/go-logr/logr"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
@@ -38,7 +40,6 @@ var minioTemplates = []string{
 	"minio/pvc.yaml.tmpl",
 	"minio/service.yaml.tmpl",
 	"minio/minio-sa.yaml.tmpl",
-	storageSecret,
 }
 
 func joinHostPort(host, port string) (string, error) {
@@ -195,10 +196,21 @@ func (r *DSPAReconciler) ReconcileStorage(ctx context.Context, dsp *dspav1alpha1
 	minioSpecified := !storageSpecified || dsp.Spec.ObjectStorage.Minio != nil
 	deployMinio := !storageSpecified || (minioSpecified && dsp.Spec.ObjectStorage.Minio.Deploy)
 
+	externalStorageCredentialsProvided := externalStorageSpecified && (dsp.Spec.ObjectStorage.ExternalStorage.S3CredentialSecret != nil)
+	minioCredentialsProvided := minioSpecified && (dsp.Spec.ObjectStorage.Minio.S3CredentialSecret != nil)
+	storageCredentialsProvided := externalStorageCredentialsProvided || minioCredentialsProvided
+
 	// If external storage is specified, it takes precedence
 	if externalStorageSpecified {
 		log.Info("Using externalStorage, bypassing object storage deployment.")
 	} else if deployMinio {
+		log.Info("No S3 storage credential reference provided, so using managed secret")
+		if !storageCredentialsProvided {
+			err := r.Apply(dsp, params, storageSecret)
+			if err != nil {
+				return err
+			}
+		}
 		log.Info("Applying object storage resources.")
 		for _, template := range minioTemplates {
 			err := r.Apply(dsp, params, template)