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>
openfga · Jun 25, 2024 · 5408b1c · 5408b1c
1 parent eed5562
commit 5408b1c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git 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
@@ -8,11 +8,20 @@ metadata:
   {{- with .Values.migrate.labels }}
     {{- toYaml . | nindent 4}}
   {{- end}}
-  {{- with .Values.migrate.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+  {{- with .Values.migrate.annotations }}
+    {{- toYaml . | nindent 4}}
+  {{- end}}
+  {{- if .Values.migrate.hook.enable }}
+    helm.sh/hook: {{ .Values.migrate.hook.hook | quote }}
+    helm.sh/hook-weight: {{ .Values.migrate.hook.hookWeight | quote }}
+    helm.sh/hook-delete-policy: {{ .Values.migrate.hook.hookDeletePolicy | quote }}
+  {{- end}}
 spec:
+  backoffLimit: 3
+  {{- if ge (int .Values.migrate.ttlSecondsAfterFinished) 0 }}
+  ttlSecondsAfterFinished: {{ .Values.migrate.ttlSecondsAfterFinished }}
+  {{- end }}
   template:
     metadata:
       {{- with .Values.migrate.annotations }}
@@ -79,5 +88,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-  backoffLimit: 1
 {{- end }}
diff --git a/charts/openfga/values.yaml b/charts/openfga/values.yaml
@@ -320,9 +320,14 @@ affinity: {}
 sidecars: []
 migrate:
   sidecars: []
-  annotations:
-    helm.sh/hook: "post-install, post-upgrade, post-rollback, post-delete"
-    helm.sh/hook-weight: "-5"
-    helm.sh/hook-delete-policy: "before-hook-creation"
+  # https://github.com/fluxcd/flux2/discussions/1085#discussioncomment-473271
+  # https://github.com/helm/helm/issues/9027#issuecomment-1908032461
+  hook:
+    enable: true
+    hook: "post-install, post-upgrade, post-rollback, post-delete"
+    hookWeight: "-5"
+    hookDeletePolicy: "before-hook-creation"
+  annotations: {}
   labels: {}
   timeout:
+  ttlSecondsAfterFinished: -1