support secret for openfga

Author: prabhatsharma

charts/openobserve-standalone/templates/configmap.yaml

@@ -44,7 +44,6 @@ data:
   ZO_BASE_URI: "{{ .Values.config.ZO_BASE_URI }}"
   ZO_META_STORE: "{{ .Values.config.ZO_META_STORE }}"
   ZO_META_POSTGRES_DSN: "{{ .Values.config.ZO_META_POSTGRES_DSN }}"
-  ZO_META_MYSQL_DSN: "{{ .Values.config.ZO_META_MYSQL_DSN }}"
   ZO_META_CONNECTION_POOL_MIN_SIZE: "{{ .Values.config.ZO_META_CONNECTION_POOL_MIN_SIZE }}"
   ZO_META_CONNECTION_POOL_MAX_SIZE: "{{ .Values.config.ZO_META_CONNECTION_POOL_MAX_SIZE }}"
   ZO_META_TRANSACTION_RETRIES: "{{ .Values.config.ZO_META_TRANSACTION_RETRIES }}"

charts/openobserve-standalone/values.yaml

@@ -112,7 +112,6 @@ config:
   ZO_BASE_URI: ""
   ZO_META_STORE: "sqlite"
   ZO_META_POSTGRES_DSN: ""
-  ZO_META_MYSQL_DSN: ""
   ZO_META_CONNECTION_POOL_MIN_SIZE: "0"
   ZO_META_CONNECTION_POOL_MAX_SIZE: "0"
   ZO_META_TRANSACTION_RETRIES: "3"

charts/openobserve/templates/openfga-deployment.yaml

@@ -27,13 +27,12 @@ spec:
               value: "postgres://openobserve:{{ .Values.postgres.spec.password }}@{{ include "openobserve.fullname" . }}-postgres-rw.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:5432/app?sslmode=disable"
               {{- else if .Values.auth.ZO_META_POSTGRES_DSN }}
               value: "{{ .Values.auth.ZO_META_POSTGRES_DSN }}"
-              {{- else if .Values.auth.ZO_META_MYSQL_DSN }}
-              value: "{{ .Values.auth.ZO_META_MYSQL_DSN }}"
-              {{- else if .Values.config.ZO_META_MYSQL_DSN }}
-              value: "{{ .Values.config.ZO_META_MYSQL_DSN }}"
               {{- else }}
               value: "{{ .Values.config.ZO_META_POSTGRES_DSN }}"
               {{- end }}
+          envFrom:
+            - secretRef:  # postgres detail can be picked up from secret
+                name: {{ if .Values.externalSecret.enabled }}{{ .Values.externalSecret.name }}{{ else }}{{ include "openobserve.fullname" . }}{{ end }}
           resources:
             limits:
               cpu: 200m

charts/openobserve/templates/secret.yaml

@@ -44,16 +44,6 @@ stringData:
   ZO_META_POSTGRES_RO_DSN: "{{ .Values.config.ZO_META_POSTGRES_RO_DSN }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.auth.ZO_META_MYSQL_DSN }}
-  ZO_META_MYSQL_DSN: "{{ .Values.auth.ZO_META_MYSQL_DSN }}"
-  {{- else }}
-  ZO_META_MYSQL_DSN: "{{ .Values.config.ZO_META_MYSQL_DSN }}"
-  {{- end }}
-  {{- if .Values.auth.ZO_META_MYSQL_RO_DSN }}
-  ZO_META_MYSQL_RO_DSN: "{{ .Values.auth.ZO_META_MYSQL_RO_DSN }}"
-  {{- else }}
-  ZO_META_MYSQL_RO_DSN: "{{ .Values.config.ZO_META_MYSQL_RO_DSN }}"
-  {{- end }}
   {{- if .Values.auth.ZO_TRACING_HEADER_KEY }}
   ZO_TRACING_HEADER_KEY: "{{ .Values.auth.ZO_TRACING_HEADER_KEY }}"
   {{- else }}

charts/openobserve/values.yaml

@@ -184,8 +184,6 @@ auth:
   AZURE_STORAGE_ACCOUNT_NAME: ""
   ZO_META_POSTGRES_DSN: "postgres://userid:password@host:5432/dbname"
   ZO_META_POSTGRES_RO_DSN: ""
-  ZO_META_MYSQL_DSN: ""
-  ZO_META_MYSQL_RO_DSN: ""
   ZO_TRACING_HEADER_KEY: "Authorization"
   ZO_TRACING_HEADER_VALUE: "Basic cm9vdEBleGFtcGxlLmNvbTpDb21wbGV4cGFzcyMxMjM="
   ZO_RUM_CLIENT_TOKEN: ""
@@ -810,7 +808,7 @@ enterprise:
         memory: 128Mi
     extraEnv: []
   openfga:
-    enabled: false
+    enabled: true
     parameters:
       O2_OPENFGA_LIST_ONLY_PERMITTED: "false"
       O2_MAP_GROUP_TO_ROLE: "true"