remove finelizer

This commit is contained in:
kkb0318
2024-04-23 22:23:33 +09:00
parent b4e1cb9c9a
commit 3473c3de2d
2 changed files with 7 additions and 5 deletions
+6 -4
View File
@@ -109,14 +109,16 @@ func (r *IRSASetupReconciler) reconcileDelete(ctx context.Context, obj *irsav1al
} }
kubeHandler := handler.NewKubernetesHandler(kubeClient) kubeHandler := handler.NewKubernetesHandler(kubeClient)
kubeHandler.Append(secret) kubeHandler.Append(secret)
err = selfhosted.Delete(ctx, factory)
if err != nil {
return err
}
err = kubeHandler.DeleteAll(ctx) err = kubeHandler.DeleteAll(ctx)
if err != nil { if err != nil {
return err return err
} }
err = selfhosted.Delete(ctx, factory)
if err != nil {
return err
}
controllerutil.RemoveFinalizer(obj, irsamanagerFinalizer)
return nil return nil
} }
@@ -52,7 +52,7 @@ var _ = Describe("IRSASetup Controller", func() {
Namespace: "default", Namespace: "default",
}, },
Spec: irsav1alpha1.IRSASetupSpec{ Spec: irsav1alpha1.IRSASetupSpec{
Mode: "selfhoted", Mode: "selfhosted",
Discovery: irsav1alpha1.Discovery{ Discovery: irsav1alpha1.Discovery{
S3: irsav1alpha1.S3Discovery{ S3: irsav1alpha1.S3Discovery{
Region: "ap-northeast-1", Region: "ap-northeast-1",