VladPolskiy/mariadb-operator
1
0
Fork 0
mirror of https://github.com/mariadb-operator/mariadb-operator.git synced 2025-07-31 21:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optional password in User CR. Locking account and expiring password if not provided

Browse Source
This commit is contained in:
Martin Montes
2024-04-29 11:56:42 +02:00
parent 1ec622a164
commit 49987ad503
15 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/controller/replication/config.go
View File

@ -162,15 +162,19 @@ func (r *ReplicationConfig) changeMaster(ctx context.Context, mariadb *mariadbv1
func (r *ReplicationConfig) reconcilePrimarySql(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB, client *sqlClient.Client) error {
if mariadb.Spec.Username != nil && mariadb.Spec.PasswordSecretKeyRef != nil {
password, err := r.refResolver.SecretKeyRef(ctx, *mariadb.Spec.PasswordSecretKeyRef, mariadb.Namespace)
if err != nil {
return fmt.Errorf("error getting password: %v", err)
}
userOpts := sqlClient.CreateUserOpts{
IdentifiedBy: password,
var createUserOpts []sqlClient.CreateUserOpt
if mariadb.Spec.PasswordSecretKeyRef != nil {
password, err := r.refResolver.SecretKeyRef(ctx, *mariadb.Spec.PasswordSecretKeyRef, mariadb.Namespace)
if err != nil {
return fmt.Errorf("error getting password: %v", err)
}
createUserOpts = append(createUserOpts, sqlClient.WithIdentifiedBy(password))
}
accountName := formatAccountName(*mariadb.Spec.Username, "%")
if err := client.CreateUser(ctx, accountName, userOpts); err != nil {
if err := client.CreateUser(ctx, accountName, createUserOpts...); err != nil {
return fmt.Errorf("error creating user: %v", err)
}
@ -244,10 +248,7 @@ func (r *ReplicationConfig) reconcileUserSql(ctx context.Context, mariadb *maria
return fmt.Errorf("error altering replication user: %v", err)
}
} else {
userOpts := sqlClient.CreateUserOpts{
IdentifiedBy: replPassword,
}
if err := client.CreateUser(ctx, accountName, userOpts); err != nil {
if err := client.CreateUser(ctx, accountName, sqlClient.WithIdentifiedBy(replPassword)); err != nil {
return fmt.Errorf("error creating replication user: %v", err)
}
}