fix: Deleting Postgres CR should delete PostgresUsers (movetokube#45)

Fixes broken `OwnerRef`

Author: oxyno-zeta

pkg/controller/postgresuser/postgresuser_controller.go

@@ -120,8 +120,21 @@ func (r *ReconcilePostgresUser) Reconcile(request reconcile.Request) (reconcile.
 	// Deletion logic
 	if instance.GetDeletionTimestamp() != nil {
 		if instance.Status.Succeeded && instance.Status.PostgresRole != "" {
-			err := r.pg.DropRole(instance.Status.PostgresRole, instance.Status.PostgresGroup,
-				instance.Status.DatabaseName, reqLogger)
+			// Initialize database name for connection with default database
+			// in case postgres cr isn't here anymore
+			db := r.pg.GetDefaultDatabase()
+			// Search Postgres CR
+			postgres, err := r.getPostgresCR(instance)
+			// Check if error exists and not a not found error
+			if err != nil && !errors.IsNotFound(err) {
+				return reconcile.Result{}, err
+			}
+			// Check if postgres cr is found and not in deletion state
+			if postgres != nil && !postgres.GetDeletionTimestamp().IsZero() {
+				db = instance.Status.DatabaseName
+			}
+			err = r.pg.DropRole(instance.Status.PostgresRole, instance.Status.PostgresGroup,
+				db, reqLogger)
 			if err != nil {
 				return reconcile.Result{}, err
 			}
@@ -194,7 +207,7 @@ func (r *ReconcilePostgresUser) Reconcile(request reconcile.Request) (reconcile.
 	if err != nil {
 		return r.requeue(instance, err)
 	}
-	err = r.addOwnerRef(instance)
+	err = r.addOwnerRef(reqLogger, instance)
 	if err != nil {
 		return r.requeue(instance, err)
 	}
@@ -241,7 +254,7 @@ func (r *ReconcilePostgresUser) addFinalizer(reqLogger logr.Logger, m *dbv1alpha
 		// Update CR
 		err := r.client.Update(context.TODO(), m)
 		if err != nil {
-			reqLogger.Error(err, "failed to update Posgres with finalizer")
+			reqLogger.Error(err, "failed to update PosgresUser with finalizer")
 			return err
 		}
 	}
@@ -300,19 +313,18 @@ func (r *ReconcilePostgresUser) getPostgresCR(instance *dbv1alpha1.PostgresUser)
 	return &database, nil
 }
 
-func (r *ReconcilePostgresUser) addOwnerRef(instance *dbv1alpha1.PostgresUser) error {
+func (r *ReconcilePostgresUser) addOwnerRef(reqLogger logr.Logger, instance *dbv1alpha1.PostgresUser) error {
+	// Search postgres database CR
 	pg, err := r.getPostgresCR(instance)
 	if err != nil {
 		return err
 	}
-	isTrue := true
-	instance.OwnerReferences = append(instance.OwnerReferences, metav1.OwnerReference{
-		APIVersion:         pg.APIVersion,
-		Kind:               pg.Kind,
-		Name:               pg.Name,
-		UID:                pg.UID,
-		Controller:         &isTrue,
-		BlockOwnerDeletion: &isTrue,
-	})
-	return nil
+	// Update owners
+	err = controllerutil.SetControllerReference(pg, instance, r.scheme)
+	if err != nil {
+		return err
+	}
+	// Update CR
+	err = r.client.Update(context.TODO(), instance)
+	return err
 }

pkg/postgres/mock/postgres.go

@@ -22,25 +22,28 @@ type PG interface {
 	DropDatabase(db string, logger logr.Logger) error
 	DropRole(role, newOwner, database string, logger logr.Logger) error
 	GetUser() string
+	GetDefaultDatabase() string
 }
 
 type pg struct {
-	db   *sql.DB
-	log  logr.Logger
-	host string
-	user string
-	pass string
-	args string
+	db               *sql.DB
+	log              logr.Logger
+	host             string
+	user             string
+	pass             string
+	args             string
+	default_database string
 }
 
 func NewPG(host, user, password, uri_args, default_database, cloud_type string, logger logr.Logger) (PG, error) {
 	postgres := &pg{
-		db:   GetConnection(user, password, host, default_database, uri_args, logger),
-		log:  logger,
-		host: host,
-		user: user,
-		pass: password,
-		args: uri_args,
+		db:               GetConnection(user, password, host, default_database, uri_args, logger),
+		log:              logger,
+		host:             host,
+		user:             user,
+		pass:             password,
+		args:             uri_args,
+		default_database: default_database,
 	}
 
 	switch cloud_type {
@@ -57,6 +60,10 @@ func (c *pg) GetUser() string {
 	return c.user
 }
 
+func (c *pg) GetDefaultDatabase() string {
+	return c.default_database
+}
+
 func GetConnection(user, password, host, database, uri_args string, logger logr.Logger) *sql.DB {
 	db, err := sql.Open("postgres", fmt.Sprintf("postgresql://%s:%s@%s/%s?%s", user, password, host, database, uri_args))
 	if err != nil {

pkg/postgres/postgres.go

@@ -65,17 +65,20 @@ func (c *pg) DropRole(role, newOwner, database string, logger logr.Logger) error
 	tmpDb := GetConnection(c.user, c.pass, c.host, database, c.args, logger)
 	_, err := tmpDb.Exec(fmt.Sprintf(REASIGN_OBJECTS, role, newOwner))
 	defer tmpDb.Close()
+	// Check if error exists and if different from "ROLE NOT FOUND" => 42704
 	if err != nil && err.(*pq.Error).Code != "42704" {
 		return err
 	}
 
 	// We previously assigned all objects to the operator's role so DROP OWNED BY will drop privileges of role
 	_, err = tmpDb.Exec(fmt.Sprintf(DROP_OWNED_BY, role))
+	// Check if error exists and if different from "ROLE NOT FOUND" => 42704
 	if err != nil && err.(*pq.Error).Code != "42704" {
 		return err
 	}
 
 	_, err = c.db.Exec(fmt.Sprintf(DROP_ROLE, role))
+	// Check if error exists and if different from "ROLE NOT FOUND" => 42704
 	if err != nil && err.(*pq.Error).Code != "42704" {
 		return err
 	}