From c5cffd41ca776ef5e0efbd0177898be39a179e4d Mon Sep 17 00:00:00 2001
From: mmontes11 <martin11lrx@gmail.com>
Date: Thu, 22 Aug 2024 21:48:16 +0200
Subject: [PATCH] Add only one password method to the initial user

---
 internal/controller/mariadb_controller.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/internal/controller/mariadb_controller.go b/internal/controller/mariadb_controller.go
index 63497f22..5dfa45c5 100644
--- a/internal/controller/mariadb_controller.go
+++ b/internal/controller/mariadb_controller.go
@@ -744,14 +744,16 @@ func (r *MariaDBReconciler) reconcileUsers(ctx context.Context, mariadb *mariadb
 					Namespace: mariadb.Namespace,
 				},
 			},
-			Metadata:                 mariadb.Spec.InheritMetadata,
-			MaxUserConnections:       20,
-			Name:                     *mariadb.Spec.Username,
-			Host:                     "%",
-			PasswordHashSecretKeyRef: mariadb.Spec.PasswordHashSecretKeyRef,
-			PasswordPlugin:           mariadb.Spec.PasswordPlugin,
+			Metadata:           mariadb.Spec.InheritMetadata,
+			MaxUserConnections: 20,
+			Name:               *mariadb.Spec.Username,
+			Host:               "%",
 		}
-		if mariadb.Spec.PasswordSecretKeyRef != nil {
+		if mariadb.Spec.PasswordPlugin != nil {
+			user.PasswordPlugin = mariadb.Spec.PasswordPlugin
+		} else if mariadb.Spec.PasswordHashSecretKeyRef != nil {
+			user.PasswordHashSecretKeyRef = mariadb.Spec.PasswordHashSecretKeyRef
+		} else if mariadb.Spec.PasswordSecretKeyRef != nil {
 			user.PasswordSecretKeyRef = &mariadb.Spec.PasswordSecretKeyRef.SecretKeySelector
 		}
 		grant := auth.GrantOpts{