chore(helm): add OpenFGA read replica

instill-ai · Mar 28, 2024 · 5cb7342 · 5cb7342
1 parent d5d80ba
commit 5cb7342
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/.env b/.env
@@ -157,7 +157,7 @@ INFLUXDB_PORT=8086
 
 # opengfa
 OPENFGA_IMAGE=openfga/openfga
-OPENFGA_VERSION=v1.3.7
+OPENFGA_VERSION=v1.5.1
 OPENFGA_HOST=openfga
 
 # otel

diff --git a/charts/core/templates/mgmt-backend/configmap.yaml b/charts/core/templates/mgmt-backend/configmap.yaml
@@ -38,6 +38,7 @@ data:
         password: {{ .Values.database.external_replica.password | default ""  }}
         host: {{ .Values.database.external_replica.host | default ""  }}
         port: {{ .Values.database.external_replica.port | default ""  }}
+        replicationtimeframe: 1
       {{- end }}
       name: mgmt
       version: {{ .Values.mgmtBackend.dbVersion }}
@@ -71,6 +72,7 @@ data:
       replica:
         host: {{ template "core.openfga" . }}
         port: 8082
+        replicationtimeframe: 1
       {{- end }}
     temporal:
       hostport: {{ default (printf "%s-frontend-headless:%s" (include "core.temporal" .) (include "core.temporal.frontend.grpcPort" .)) .Values.mgmtBackend.temporal.hostPort }}

diff --git a/charts/core/templates/model-backend/configmap.yaml b/charts/core/templates/model-backend/configmap.yaml
@@ -67,6 +67,7 @@ data:
         password: {{ .Values.database.external_replica.password | default ""  }}
         host: {{ .Values.database.external_replica.host | default ""  }}
         port: {{ .Values.database.external_replica.port | default ""  }}
+        replicationtimeframe: 1
       {{- end }}
       name: model
       version: {{ .Values.modelBackend.dbVersion }}
@@ -107,6 +108,7 @@ data:
       replica:
         host: {{ template "core.openfga" . }}
         port: 8082
+        replicationtimeframe: 1
       {{- end }}
     registry:
       host: {{ template "core.registry" . }}

diff --git a/charts/core/templates/openfga/deployment.yaml b/charts/core/templates/openfga/deployment.yaml
@@ -84,16 +84,8 @@ spec:
           env:
             - name: OPENFGA_DATASTORE_ENGINE
               value: postgres
-            - name: PGDATABASE
-              value: openfga
-            - name: PGHOST
-              value: "{{ default (include "core.database.host" .) .Values.database.external.host }}"
-            - name: PGPORT
-              value: "{{ default (include "core.database.port" .) .Values.database.external.port }}"
-            - name: PGUSER
-              value: "{{ default (include "core.database.username" .) .Values.database.external.username }}"
-            - name: PGPASSWORD
-              value: "{{ default (include "core.database.rawPassword" .) .Values.database.external.password }}"
+            - name: OPENFGA_DATASTORE_URI
+              value: postgres://{{ .Values.database.external.username }}:{{ .Values.database.external.password }}@{{ .Values.database.external.host }}:{{ .Values.database.external.port }}/openfga?sslmode=disable
       containers:
         - name: openfga
           image: {{ .Values.openfga.image.repository }}:{{ .Values.openfga.image.tag }}
@@ -121,6 +113,8 @@ spec:
           ports:
             - containerPort: 8080
               protocol: TCP
+            - containerPort: 8081
+              protocol: TCP
         {{- if .Values.database.external_replica }}
         - name: openfga-read-replica
           image: {{ .Values.openfga.image.repository }}:{{ .Values.openfga.image.tag }}
@@ -152,6 +146,8 @@ spec:
           ports:
             - containerPort: 8082
               protocol: TCP
+            - containerPort: 8083
+              protocol: TCP
           {{- end }}
       {{- with .Values.openfga.nodeSelector }}
       nodeSelector:

diff --git a/charts/core/templates/openfga/service.yaml b/charts/core/templates/openfga/service.yaml
@@ -14,10 +14,16 @@ spec:
     - name: openfga
       port: 8080
       targetPort: 8080
+    - name: openfga-grpc
+      port: 8081
+      targetPort: 8081
     {{- if .Values.database.external_replica }}
     - name: openfga-read-replica
       port: 8082
       targetPort: 8082
+    - name: openfga-read-replica-grpc
+      port: 8083
+      targetPort: 8083
     {{- end }}
   selector:
     {{- include "core.matchLabels" . | nindent 4 }}

diff --git a/charts/core/templates/pipeline-backend/configmap.yaml b/charts/core/templates/pipeline-backend/configmap.yaml
@@ -61,6 +61,7 @@ data:
         password: {{ .Values.database.external_replica.password | default ""  }}
         host: {{ .Values.database.external_replica.host | default ""  }}
         port: {{ .Values.database.external_replica.port | default ""  }}
+        replicationtimeframe: 1
       {{- end }}
       name: pipeline
       version: {{ .Values.pipelineBackend.dbVersion }}
@@ -96,9 +97,10 @@ data:
         port: {{ template "core.otel.port" . }}
     openfga:
       host: {{ template "core.openfga" . }}
-      port: 8080
+      port: 8081
       {{- if .Values.database.external_replica }}
       replica:
         host: {{ template "core.openfga" . }}
-        port: 8082
+        port: 8083
+        replicationtimeframe: 1
       {{- end }}
diff --git a/charts/core/values.yaml b/charts/core/values.yaml
@@ -1346,7 +1346,7 @@ grafana:
 openfga:
   image:
     repository: openfga/openfga
-    tag: v1.3.7
+    tag: v1.5.1
     pullPolicy: IfNotPresent
   # -- Set the service account to be used, default if left empty
   serviceAccountName: ""