BREAKING CHANGE: move .migrate to .datastore.migrations

openfga · Oct 5, 2024 · 136354a · 136354a
1 parent 88eaf10
commit 136354a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/charts/openfga/templates/job.yaml b/charts/openfga/templates/job.yaml
@@ -5,21 +5,21 @@ metadata:
   name: {{ include "openfga.fullname" . }}-migrate
   labels:
     {{- include "openfga.labels" . | nindent 4 }}
-  {{- with .Values.migrate.labels }}
+  {{- with .Values.datastore.migrations.labels }}
     {{- toYaml . | nindent 4}}
   {{- end}}
-  {{- with .Values.migrate.annotations }}
+  {{- with .Values.datastore.migrations.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   template:
     metadata:
-      {{- with .Values.migrate.annotations }}
+      {{- with .Values.datastore.migrations.annotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.migrate.labels }}
+      {{- with .Values.datastore.migrations.labels }}
       labels:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -52,9 +52,9 @@ spec:
                   key: "uri"
             {{- end }}
 
-            {{- if .Values.migrate.timeout }}
+            {{- if .Values.datastore.migrations.timeout }}
             - name: OPENFGA_TIMEOUT
-              value: "{{ .Values.migrate.timeout }}"
+              value: "{{ .Values.datastore.migrations.timeout }}"
             {{- end }}
 
             {{- with .Values.extraEnvVars }}
@@ -63,15 +63,15 @@ spec:
 
           resources:
             {{- toYaml .Values.datastore.migrations.resources | nindent 12 }}
-          {{- with .Values.migrate.extraVolumeMounts }}
+          {{- with .Values.datastore.migrations.extraVolumeMounts }}
           volumeMounts:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-        {{- if .Values.migrate.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.migrate.sidecars "context" $) | nindent 8 }}
+        {{- if .Values.datastore.migrations.sidecars }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.datastore.migrations.sidecars "context" $) | nindent 8 }}
         {{- end }}
       restartPolicy: Never
-      {{- with .Values.migrate.extraVolumes }}
+      {{- with .Values.datastore.migrations.extraVolumes }}
       volumes:
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/openfga/values.yaml b/charts/openfga/values.yaml
@@ -203,6 +203,16 @@ datastore:
       repository: groundnuty/k8s-wait-for
       pullPolicy: Always
       tag: "v2.0"
+    extraVolumes: []
+    extraVolumeMounts: []
+    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"
+    labels: {}
+    timeout:
+
 
 postgresql:
   ## @param postgresql.enabled enable the bitnami/postgresql subchart and deploy Postgres
@@ -318,16 +328,6 @@ affinity: {}
 #       - name: portname
 #         containerPort: 1234
 sidecars: []
-migrate:
-  extraVolumes: []
-  extraVolumeMounts: []
-  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"
-  labels: {}
-  timeout:
 
 # -- Array of extra K8s manifests to deploy
 ## Note: Supports use of custom Helm templates