From 3473c3de2d0144db6cc35d93a6e6040774d63d17 Mon Sep 17 00:00:00 2001 From: kkb0318 Date: Tue, 23 Apr 2024 22:23:33 +0900 Subject: [PATCH] remove finelizer --- internal/controller/irsasetup_controller.go | 10 ++++++---- internal/controller/irsasetup_controller_test.go | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/controller/irsasetup_controller.go b/internal/controller/irsasetup_controller.go index 28150c7..1e13229 100644 --- a/internal/controller/irsasetup_controller.go +++ b/internal/controller/irsasetup_controller.go @@ -109,14 +109,16 @@ func (r *IRSASetupReconciler) reconcileDelete(ctx context.Context, obj *irsav1al } kubeHandler := handler.NewKubernetesHandler(kubeClient) kubeHandler.Append(secret) - err = selfhosted.Delete(ctx, factory) - if err != nil { - return err - } err = kubeHandler.DeleteAll(ctx) if err != nil { return err } + err = selfhosted.Delete(ctx, factory) + if err != nil { + return err + } + controllerutil.RemoveFinalizer(obj, irsamanagerFinalizer) + return nil } diff --git a/internal/controller/irsasetup_controller_test.go b/internal/controller/irsasetup_controller_test.go index 6191bfc..6824868 100644 --- a/internal/controller/irsasetup_controller_test.go +++ b/internal/controller/irsasetup_controller_test.go @@ -52,7 +52,7 @@ var _ = Describe("IRSASetup Controller", func() { Namespace: "default", }, Spec: irsav1alpha1.IRSASetupSpec{ - Mode: "selfhoted", + Mode: "selfhosted", Discovery: irsav1alpha1.Discovery{ S3: irsav1alpha1.S3Discovery{ Region: "ap-northeast-1",