The database name must always be fixed, this changes should make it c…

…onsistent

controllers/aodh_controller.go

@@ -151,25 +151,19 @@ func (r *AutoscalingReconciler) reconcileInitAodh(
 	// create service DB instance
 	//
 	db := mariadbv1.NewDatabaseWithNamespace(
-		// instance.Name
-		// TODO: We might want to change the db name.
-		// The mariadb-operator is currently implemented
-		// in a way, that the db name needs to be the
-		// same as the user
-		instance.Spec.Aodh.DatabaseUser,
+		autoscaling.DatabaseName,
 		instance.Spec.Aodh.DatabaseUser,
 		instance.Spec.Aodh.Secret,
 		map[string]string{
-			"dbName": instance.Spec.Aodh.DatabaseInstance,
+			"dbName": autoscaling.DatabaseName,
 		},
 		autoscaling.ServiceName,
 		instance.Namespace,
 	)
 	// create or patch the DB
-	ctrlResult, err = db.CreateOrPatchDBByName(
+	ctrlResult, err = db.CreateOrPatchAll(
 		ctx,
 		helper,
-		instance.Spec.Aodh.DatabaseInstance,
 	)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(

controllers/autoscaling_controller.go

@@ -523,7 +523,7 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(autoscaling.ServiceName), map[string]string{})
 
 	// the aodh controller currently creates the db with the user
-	db, err := mariadbv1.GetDatabaseByName(ctx, h, instance.Spec.Aodh.DatabaseUser)
+	db, err := mariadbv1.GetDatabaseByName(ctx, h, autoscaling.DatabaseName)
 	if err != nil {
 		return err
 	}