fix: add logs & fix finalizer deletion logic (#301)

Signed-off-by: maslow <[email protected]>

Author: maslow

controllers/database/controllers/database_controller.go

@@ -52,10 +52,11 @@ type DatabaseReconciler struct {
 func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := log.FromContext(ctx)
 
+	log.Info("reconciling database")
+
 	// get the database
 	var database databasev1.Database
 	if err := r.Get(ctx, req.NamespacedName, &database); err != nil {
-		log.Error(err, "unable to fetch Database")
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
@@ -69,13 +70,16 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 
 // apply the database
 func (r *DatabaseReconciler) apply(ctx context.Context, database *databasev1.Database) (ctrl.Result, error) {
+	log := log.FromContext(ctx)
+
 	// add the finalizer
 	if database.ObjectMeta.DeletionTimestamp.IsZero() {
 		if !util.ContainsString(database.ObjectMeta.Finalizers, "database.laf.dev") {
 			database.ObjectMeta.Finalizers = append(database.ObjectMeta.Finalizers, "database.laf.dev")
 			if err := r.Update(ctx, database); err != nil {
 				return ctrl.Result{}, err
 			}
+			log.Info("added the finalizer")
 		}
 	}
 
@@ -85,13 +89,15 @@ func (r *DatabaseReconciler) apply(ctx context.Context, database *databasev1.Dat
 		if err := r.selectStore(ctx, database); err != nil {
 			return ctrl.Result{}, err
 		}
+		log.Info("selected a store for database")
 	}
 
 	// reconcile the connection uri
 	if database.Status.ConnectionURI == "" {
 		if err := r.createDatabase(ctx, database); err != nil {
 			return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 10}, err
 		}
+		log.Info("created database successfully")
 	}
 
 	// TODO: reconcile the storage capacity
@@ -127,14 +133,15 @@ func (r *DatabaseReconciler) delete(ctx context.Context, database *databasev1.Da
 		return ctrl.Result{}, err
 	}
 
-	log.Info("database deleted", "name", database.Name)
+	log.Info("database user deleted", "name", database.Name)
 
 	// remove the finalizer
-	database.ObjectMeta.Finalizers = nil
+	database.ObjectMeta.Finalizers = util.RemoveString(database.ObjectMeta.Finalizers, "database.laf.dev")
 	if err := r.Update(ctx, database); err != nil {
 		return ctrl.Result{}, err
 	}
 
+	log.Info("removed the finalizer")
 	return ctrl.Result{}, nil
 }
 
@@ -245,7 +252,6 @@ func (r *DatabaseReconciler) getDatabaseStore(ctx context.Context, storeNamespac
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *DatabaseReconciler) SetupWithManager(mgr ctrl.Manager) error {
-
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&databasev1.Database{}).
 		Complete(r)

controllers/database/controllers/store_controller.go

@@ -18,13 +18,12 @@ package controllers
 
 import (
 	"context"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 
+	databasev1 "github.com/labring/laf/controllers/database/api/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	databasev1 "github.com/labring/laf/controllers/database/api/v1"
 )
 
 // StoreReconciler reconciles a Store object
@@ -39,18 +38,14 @@ type StoreReconciler struct {
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
-// TODO(user): Modify the Reconcile function to compare the state specified by
 // the Store object against the actual cluster state, and then
 // perform operations to make the cluster state reflect the state specified by
 // the user.
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 func (r *StoreReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	log := log.FromContext(ctx)
-
-	log.Info("Reconciling Store")
-
+	_ = log.FromContext(ctx)
 	return ctrl.Result{}, nil
 }
 

pkg/util/string.go

@@ -8,3 +8,12 @@ func ContainsString(finalizers []string, s string) bool {
 	}
 	return false
 }
+
+func RemoveString(finalizers []string, s string) []string {	
+	for i, v := range finalizers {
+		if v == s {
+			return append(finalizers[:i], finalizers[i+1:]...)
+		}
+	}
+	return finalizers
+}