From 1fe1b66895193a951886c9f258c842a83848d454 Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Tue, 4 Jun 2024 10:39:23 -0700
Subject: [PATCH] Run migrate job as pre hook with option to auto cleanup

xref: https://x.com/tsaha/status/1805382111844778275

Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 charts/openfga/Chart.yaml         | 2 +-
 charts/openfga/templates/job.yaml | 5 ++++-
 charts/openfga/values.yaml        | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/openfga/Chart.yaml b/charts/openfga/Chart.yaml
index 80261e6..272b44d 100644
--- a/charts/openfga/Chart.yaml
+++ b/charts/openfga/Chart.yaml
@@ -3,7 +3,7 @@ name: openfga
 description: A Kubernetes Helm chart for the OpenFGA project.
 
 type: application
-version: 0.2.6
+version: 0.2.7
 appVersion: "v1.5.4"
 
 home: "https://openfga.github.io/helm-charts"
diff --git a/charts/openfga/templates/job.yaml b/charts/openfga/templates/job.yaml
index 8a1acdc..b524a7d 100644
--- a/charts/openfga/templates/job.yaml
+++ b/charts/openfga/templates/job.yaml
@@ -13,6 +13,10 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  backoffLimit: 3
+  {{- if ge .Values.migrate.ttlSecondsAfterFinished 0 }}
+  ttlSecondsAfterFinished: {{ .Values.migrate.ttlSecondsAfterFinished }}
+  {{- end }}
   template:
     metadata:
       {{- with .Values.migrate.annotations }}
@@ -79,5 +83,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-  backoffLimit: 1
 {{- end }}
diff --git a/charts/openfga/values.yaml b/charts/openfga/values.yaml
index 5222fe7..f56c6ee 100644
--- a/charts/openfga/values.yaml
+++ b/charts/openfga/values.yaml
@@ -320,9 +320,12 @@ affinity: {}
 sidecars: []
 migrate:
   sidecars: []
+  # https://github.com/fluxcd/flux2/discussions/1085#discussioncomment-473271
+  # https://github.com/helm/helm/issues/9027#issuecomment-1908032461
   annotations:
-    helm.sh/hook: "post-install, post-upgrade, post-rollback, post-delete"
+    helm.sh/hook: "pre-install, pre-upgrade, pre-rollback, pre-delete"
     helm.sh/hook-weight: "-5"
     helm.sh/hook-delete-policy: "before-hook-creation"
   labels: {}
   timeout:
+  ttlSecondsAfterFinished: -1