From 51b103324fe5ac521b828122d889e18d62453b0e Mon Sep 17 00:00:00 2001 From: Vladislav Alexandrovich Tolstykh Date: Wed, 13 Mar 2024 19:45:30 +0300 Subject: [PATCH] fix: Use Cascading Deletion in a Cluster --- pkg/controller/postgres/postgres_controller.go | 2 +- pkg/controller/postgres/postgres_controller_test.go | 8 ++++---- pkg/controller/postgresuser/postgresuser_controller.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controller/postgres/postgres_controller.go b/pkg/controller/postgres/postgres_controller.go index 37f0d8a6..c9371523 100644 --- a/pkg/controller/postgres/postgres_controller.go +++ b/pkg/controller/postgres/postgres_controller.go @@ -254,7 +254,7 @@ func (r *ReconcilePostgres) Reconcile(request reconcile.Request) (_ reconcile.Re func (r *ReconcilePostgres) addFinalizer(reqLogger logr.Logger, m *dbv1alpha1.Postgres) error { if len(m.GetFinalizers()) < 1 && m.GetDeletionTimestamp() == nil { reqLogger.Info("adding Finalizer for Postgres") - m.SetFinalizers([]string{"finalizer.db.movetokube.com"}) + m.SetFinalizers([]string{"foregroundDeletion"}) } return nil } diff --git a/pkg/controller/postgres/postgres_controller_test.go b/pkg/controller/postgres/postgres_controller_test.go index 4c45db3b..aa095d73 100644 --- a/pkg/controller/postgres/postgres_controller_test.go +++ b/pkg/controller/postgres/postgres_controller_test.go @@ -85,7 +85,7 @@ var _ = Describe("ReconcilePostgres", func() { Name: name, Namespace: namespace, DeletionTimestamp: &now, - Finalizers: []string{"finalizer.db.movetokube.com"}, + Finalizers: []string{"foregroundDeletion"}, }, Spec: v1alpha1.PostgresSpec{ Database: name, @@ -200,7 +200,7 @@ var _ = Describe("ReconcilePostgres", func() { foundPostgres := &v1alpha1.Postgres{} err = cl.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: namespace}, foundPostgres) Expect(err).To(BeNil()) - Expect(foundPostgres.GetFinalizers()[0]).To(Equal("finalizer.db.movetokube.com")) + Expect(foundPostgres.GetFinalizers()[0]).To(Equal("foregroundDeletion")) }) }) @@ -401,7 +401,7 @@ var _ = Describe("ReconcilePostgres", func() { }) It("should set a finalizer", func() { - expectedFinalizer := "finalizer.db.movetokube.com" + expectedFinalizer := "foregroundDeletion" // Call Reconcile _, err := rp.Reconcile(req) // No error should be returned @@ -707,7 +707,7 @@ var _ = Describe("ReconcilePostgres", func() { // Expected method calls // customers schema errors pg.EXPECT().CreateSchema(name, name+"-group", "customers", gomock.Any()).Return(fmt.Errorf("Could not create schema")).Times(1) - pg.EXPECT().SetSchemaPrivileges(name, name+"-group", gomock.Any(), "customers", gomock.Any(), gomock.Any() ,gomock.Any()).Return(nil).Times(0) + pg.EXPECT().SetSchemaPrivileges(name, name+"-group", gomock.Any(), "customers", gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(0) // stores schema pg.EXPECT().CreateSchema(name, name+"-group", "stores", gomock.Any()).Return(nil).Times(1) pg.EXPECT().SetSchemaPrivileges(name, name+"-group", name+"-reader", "stores", gomock.Any(), false, gomock.Any()).Return(nil).Times(1) diff --git a/pkg/controller/postgresuser/postgresuser_controller.go b/pkg/controller/postgresuser/postgresuser_controller.go index 85a9437f..8936719c 100644 --- a/pkg/controller/postgresuser/postgresuser_controller.go +++ b/pkg/controller/postgresuser/postgresuser_controller.go @@ -267,7 +267,7 @@ func (r *ReconcilePostgresUser) Reconcile(request reconcile.Request) (reconcile. func (r *ReconcilePostgresUser) addFinalizer(reqLogger logr.Logger, m *dbv1alpha1.PostgresUser) error { if len(m.GetFinalizers()) < 1 && m.GetDeletionTimestamp() == nil { reqLogger.Info("adding Finalizer for Postgres") - m.SetFinalizers([]string{"finalizer.db.movetokube.com"}) + m.SetFinalizers([]string{"foregroundDeletion"}) // Update CR err := r.client.Update(context.TODO(), m)