feat: 接通 PostgreSQL 角色与数据库创建闭环

internal/database/controller/credential_controller.go

@@ -35,12 +35,14 @@ func (r *CredentialReconciler) SetupWithManager(manager ctrl.Manager) error {
 	}
 	return ctrl.NewControllerManagedBy(manager).
 		Named("database-credentials").For(&databasev1alpha1.PostgreSQLDatabase{}).
-		Watches(&databasev1alpha1.PostgreSQLTenant{}, handler.EnqueueRequestsFromMapFunc(r.requestsForTenant)).
-		Watches(&databasev1alpha1.PostgreSQLInstance{}, handler.EnqueueRequestsFromMapFunc(r.requestsForInstance)).
+		Watches(&databasev1alpha1.PostgreSQLTenant{}, handler.EnqueueRequestsFromMapFunc(databaseRequestsForTenant)).
+		Watches(&databasev1alpha1.PostgreSQLInstance{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []ctrl.Request {
+			return databaseRequestsForInstance(ctx, r.Client, object)
+		})).
 		Complete(r)
 }
 
-func (r *CredentialReconciler) requestsForTenant(_ context.Context, object client.Object) []ctrl.Request {
+func databaseRequestsForTenant(_ context.Context, object client.Object) []ctrl.Request {
 	tenant := object.(*databasev1alpha1.PostgreSQLTenant)
 	if tenant.Status.DatabaseRef == nil {
 		return nil
@@ -48,9 +50,9 @@ func (r *CredentialReconciler) requestsForTenant(_ context.Context, object clien
 	return []ctrl.Request{{Name: string(tenant.Status.DatabaseRef.Name)}}
 }
 
-func (r *CredentialReconciler) requestsForInstance(ctx context.Context, object client.Object) []ctrl.Request {
+func databaseRequestsForInstance(ctx context.Context, cache client.Client, object client.Object) []ctrl.Request {
 	databases := &databasev1alpha1.PostgreSQLDatabaseList{}
-	if err := r.Client.List(ctx, databases); err != nil {
+	if err := cache.List(ctx, databases); err != nil {
 		ctrl.LoggerFrom(ctx).Error(err, "无法映射 Instance 凭据准备事件；等待低频重试")
 		return nil
 	}

internal/database/controller/instance_controller_test.go

@@ -18,6 +18,7 @@ import (
 )
 
 type instanceBackend struct {
+	application.ResourceDatabase
 	checks  instance.ManagementChecks
 	err     error
 	inspect func()

internal/database/controller/provisioning_controller.go

@@ -0,0 +1,43 @@
+package controller
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	databasev1alpha1 "git.ddupan.top/panxiao81/ayatori/api/database/v1alpha1"
+	"git.ddupan.top/panxiao81/ayatori/internal/database/application"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+)
+
+type ProvisioningReconciler struct {
+	Client  client.Client
+	Service *application.DatabaseReconciliation
+}
+
+func NewProvisioningReconciler(cache client.Client, service *application.DatabaseReconciliation) *ProvisioningReconciler {
+	return &ProvisioningReconciler{Client: cache, Service: service}
+}
+
+func (r *ProvisioningReconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
+	operationContext, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
+	if err := r.Service.Reconcile(operationContext, request.Name); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: dependencyRetry}, nil
+}
+
+func (r *ProvisioningReconciler) SetupWithManager(manager ctrl.Manager) error {
+	if r.Client == nil || r.Service == nil {
+		return errors.New("provisioning controller requires injected client and use case")
+	}
+	return ctrl.NewControllerManagedBy(manager).Named("database-provisioning").
+		For(&databasev1alpha1.PostgreSQLDatabase{}).
+		Watches(&databasev1alpha1.PostgreSQLTenant{}, handler.EnqueueRequestsFromMapFunc(databaseRequestsForTenant)).
+		Watches(&databasev1alpha1.PostgreSQLInstance{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []ctrl.Request {
+			return databaseRequestsForInstance(ctx, r.Client, object)
+		})).Complete(r)
+}