Merge branch 'main' into conflicts

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.9.0
 
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'

README.md

@@ -4,7 +4,7 @@ Helm charts maintained by the OpenFGA team!
 
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/openfga)](https://artifacthub.io/packages/helm/openfga/openfga)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](./LICENSE)
-[![Discord Server](https://img.shields.io/discord/759188666072825867?color=7289da&logo=discord "Discord Server")](https://discord.gg/8naAwJfWN6)
+[![Join our community](https://img.shields.io/badge/slack-cncf_%23openfga-40abb8.svg?logo=slack)](https://openfga.dev/community)
 [![Twitter](https://img.shields.io/twitter/follow/openfga?color=%23179CF0&logo=twitter&style=flat-square "@openfga on Twitter")](https://twitter.com/openfga)
 
 [OpenFGA](https://github.com/openfga/openfga) is a high-performance and flexible authorization/permission engine built for developers and inspired by [Google Zanzibar](https://research.google/pubs/pub48190/).
@@ -25,4 +25,4 @@ See [CONTRIBUTING](https://github.com/openfga/.github/blob/main/CONTRIBUTING.md)
 
 ## License
 
-This project is licensed under the Apache-2.0 license. See the [LICENSE](https://github.com/openfga/helm-charts/blob/main/LICENSE) file for more info.
+This project is licensed under the Apache-2.0 license. See the [LICENSE](https://github.com/openfga/helm-charts/blob/main/LICENSE) file for more info.

charts/openfga/Chart.lock

@@ -8,5 +8,5 @@ dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 2.13.3
-digest: sha256:68e2cc3b60ae8e31f7749a5f1f3e7838660f6c0e2f0b40d9f5fa353afe880521
-generated: "2023-12-01T15:06:50.541713+01:00"
+digest: sha256:a152c0abc09cadc6a2158e237b67485b3177d1ed8ad9b7f0b64af300b4eb6e25
+generated: "2024-03-07T16:13:52.695937-07:00"

charts/openfga/Chart.yaml

@@ -3,8 +3,8 @@ name: openfga
 description: A Kubernetes Helm chart for the OpenFGA project.
 
 type: application
-version: 0.1.36
-appVersion: "v1.4.3"
+version: 0.1.40
+appVersion: "v1.5.0"
 
 home: "https://openfga.github.io/helm-charts/charts/openfga"
 icon: https://github.com/openfga/community/raw/main/brand-assets/icon/color/openfga-icon-color.svg
@@ -19,7 +19,7 @@ dependencies:
   - name: postgresql
     version: "12.12.10"
     repository: https://charts.bitnami.com/bitnami
-    condition: postgres.enabled
+    condition: postgresql.enabled
   - name: mysql
     version: "9.6.0"
     repository: https://charts.bitnami.com/bitnami

charts/openfga/README.md

@@ -28,7 +28,7 @@ If you do not already have a Postgres deployment, you can deploy OpenFGA with Po
 $ helm install openfga openfga/openfga \
   --set datastore.engine=postgres \
   --set datastore.uri="postgres://postgres:[email protected]:5432/postgres?sslmode=disable" \
-  --set postgres.enabled=true \
+  --set postgresql.enabled=true \
   --set postgresql.auth.postgresPassword=password \
   --set postgresql.auth.database=postgres
 ```

charts/openfga/templates/deployment.yaml

@@ -10,7 +10,7 @@ metadata:
   {{- end }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ ternary 1 .Values.replicaCount (eq .Values.datastore.engine "memory")}}
   {{- end }}
   selector:
     matchLabels:
@@ -218,6 +218,11 @@ spec:
               value: {{ .Values.log.level }}
             {{- end }}
 
+            {{- if .Values.log.timestampFormat }}
+            - name: OPENFGA_LOG_TIMESTAMP_FORMAT
+              value: {{ .Values.log.timestampFormat }}
+            {{- end }}
+
             {{- if .Values.maxTuplesPerWrite }}
             - name: OPENFGA_MAX_TUPLES_PER_WRITE
               value: "{{ .Values.maxTuplesPerWrite }}"

charts/openfga/values.schema.json

@@ -276,7 +276,7 @@
                 }
             }
         },
-        "postgres": {
+        "postgresql": {
             "type": "object",
             "properties": {
                 "enabled": {
@@ -504,6 +504,15 @@
                         "json"
                     ],
                     "default": "json"
+                },
+                "timestampFormat": {
+                    "type": "string",
+                    "description": "The timestamp format to use for the log output",
+                    "enum": [
+                        "Unix",
+                        "ISO8601"
+                    ],
+                    "default": "Unix"
                 }
             }
         },

charts/openfga/values.yaml

@@ -154,8 +154,8 @@ datastore:
       pullPolicy: Always
       tag: "v2.0"
 
-postgres:
-  ## @param postgres.enabled enable the bitnami/postgresql subchart and deploy Postgres
+postgresql:
+  ## @param postgresql.enabled enable the bitnami/postgresql subchart and deploy Postgres
   enabled: false
 
 mysql:
@@ -199,6 +199,7 @@ profiler:
 log:
   level: info
   format: json
+  timestampFormat: Unix
 
 checkQueryCache:
   enabled: false